Merge proposals dependent on lp://staging/~zaspire/unity-firefox-extension/context-reinitialization

1. context-reinitialization
2. Dependent merge proposals