Bug 1003736 - [Settings] Two column not right displayed
Revert "Bug 841422 - Move unit tests for shared code out of gallery r=lightsofapollo"

This reverts commit 09411b0bc84f9e5e30e410b1fbb2612872a0f55e.
Bug 1006236 - Whitelist phone production apps r=yuren
Merge pull request #18963 from KevinGrandon/bug_1006236_whitelist_phone_production_apps

Bug 1006236 - Whitelist phone production apps
Merge pull request #18924 from gasolin/issue-1003736

Bug 1003736 - [Settings] Two column not right displayed, r=arthur