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

1. clean-extension
2. Dependent merge proposals