Merge proposals dependent on lp://staging/~abreu-alexandre/webbrowser-app/deprecate-break-html5-container

1. deprecate-break-html5-container
2. Dependent merge proposals