Merge branch 'onboarding-test-2' of github.com:ghostery/ghostery-exte… …
…nsion into onboarding-test-2