Merge proposals dependent on lp://qastaging/~webapps/unity-chromium-extension/webapps-extension

1. webapps-extension
2. Dependent merge proposals