Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0
Bug 1003993 - FxA System app - remove refs to 'accountId', replace with 'email'. r=ferjm
Bug 1004099 - FxA Settings app - remove refs to 'accountId', replace with 'email'. r=arthurcc
Bug 971443 - [System2] Instantiable Accessibility r=alive
Bug 1000132 - [Building Blocks] Split headers.css to demo @import
Bug 999506 - Detect the device_root before pushing/clearing files from the device, remove hardcoded references to /sdcard
Bug 986062 - Adding a test making sure we don't do any reflows while using the edge gestures.
Bug 1004438 - [NFC] NDEF TNF Absolute URI should be handled properly in NfcManager
Bug 1005797 - NFC: There should be an icon for NFC on the status bar
Merge branch 'master' into settings-stringRemoval
Bug 1001901 - [ftu] remove unused localization strings from Firefox OS 2.0
Bug 1000599 - Use the new & fixed mozL10n.ready in Settings. r=arthur
Bug 1007147 - Fit visual details to icons label
 Bug 1007628 - [Follow up] [BB] Buttons: update list button to new specs
Merge pull request #18711 from Archaeopteryx/settings-stringRemoval

Bug 1001856 - [settings] remove unused localization strings from Firefox OS 2.0. r=evelyn
Merge pull request #19056 from Archaeopteryx/ftu-stringRemoval

Bug 1001901 - [ftu] remove unused localization strings from Firefox OS 2.0. r=fcampo
Merge pull request #19063 from pacorampas/buttons-settings-1003817

Bug 1007628 - [Follow up] [BB] Buttons: update list button to new specs r=me
Merge pull request #18933 from stasm/1000599-settings-ready

Bug 1000599 - Use the new & fixed mozL10n.ready in Settings. r=arthur
Bug 1003874 - [FTU-Separation] Move import connectors to shared
Bug 998723 - [Contacts] Add missing plural form to mergeActionButtonLabel