Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Bug 960861 - mozMobileConnections should not be requisites for airplane mode

- add Radio.js
- add Radio related tests
- use this radio service in ariplaneMode
Bug 968912 - Make an app object for FTU and write a test for desktopb2g/CI
Bug 960500 - [Buri][Data usage] Show a specific message when launching data usage app under airplane mode scenario
Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt when deleting apps from the dock
Bug 929917 - UI Test app for Firefox Accounts DOM API
Bug 983070 - [Message][UI Test] The received message should not causes message thread to open in the thread list view.
Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
Bug 972699 - Fix unit test zero coverage when using lazy load
Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js.

Conflicts:
	apps/system/js/nfc_handover_manager.js
	apps/system/js/nfc_manager_utils.js
Bug 961800 - Implement Child Window Factory

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
Merge pull request #17363 from yurenju/stage2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 984574 - JSHint fixes. r=kgrandon
Bug 985090 - Fix voicemail number migration issue and refactor
Merge pull request #17369 from yurenju/nfc

Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js. r=@alivedise
Bug 980344 - [FTE] Fixed some jshint errors
Merge pull request #17370 from alivedise/bugzilla/961800_master_merging/child-window-factory

Bug 961800 - Implement Child Window Factory, r=etienne
Bug 981401 - [Messages] Notification does not vanish when the SMS is read when going back from sleep
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" for Breaking Windows Builds

This reverts commit 91c8fd2a33c9be6a745a3f30a6e5113831655502.
Merge pull request #17330 from steveck-chung/bug-981401

Bug 981401 - [Messages] Notification does not vanish when the SMS is read when going back from sleep. r=arcturus