Bug 1003736 - [Settings] Two column not right displayed
Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager
Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is broken
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
Merge pull request #18931 from tauzen/Bug1004218

Bug 1004218 - [NFC] Smart Poster Action handling should be removed from NfcManager, r=alive
Merge pull request #18947 from jmcanterafonseca/fix_build

Bug 1005951 - Follow-up bug 1001370 webapp-shared.js in line 167 is brok...
Bug 973445 - [settings] refactor Sound panel with AMD pattern
disable TBPL test
TBPL test 2
put orm shim in separate form