Merge proposals dependent on lp://staging/~abreu-alexandre/unity-firefox-extension/fix-1168020-private-browsing-quantal

1. fix-1168020-private-browsing-quantal
2. Dependent merge proposals