Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator
Bug 971498 - [System2] Instantiable HomescreenLauncher

Conflicts:
	apps/system/js/homescreen_launcher.js
	apps/system/test/unit/app_window_manager_test.js
	apps/system/test/unit/bootstrap_test.js
	apps/system/test/unit/homescreen_window_test.js

Bug 979212 - Require MockHomescreenLauncher in unit test of EdgeSwipeDetector

Conflicts:
	apps/system/test/unit/bootstrap_test.js
Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
disable after switching the keyboard as pinyin.
 - Remove the touchmove event listeners from the touched keys when
   switching layouts.
Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable
Bug 974253 - Set preferred network type on startup based on the user preference
Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x"

This reverts commit d19a7fb3efa74c479be7f0b24f030e9895eb4b7a, reversing
changes made to 732a35447c7da220578fc21e10fe119c2552d662.
Merge pull request #17615 from gaye/backout-marionette-client-bump

Revert "Merge pull request #17609 from KevinGrandon/bug_985112_marionett...
Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"

This reverts commit 2f48cfaf3dcc1732c57dbc0706819e9359d79fce, reversing
changes made to ede2b2488f467a0b8bddf5a741e07464cd15f735.
Merge pull request #17619 from KevinGrandon/revert_camera_features

Revert "Merge pull request #17599 from dmarcos/camera-new-features-master"
Merge pull request #17600 from zacc/bug_987847

Bug 987847 - Debug test_settings_wallpaper.py
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
Merge pull request #17571 from RudyLu/keyboard/Bug983012_master

Bug 983012 - [Sora][Message][Input method]The virtual keyboard is
r=timdream
Merge pull request #17562 from crh0716/974253_v2

Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo
Merge pull request #17622 from yurenju/stage-windows-squash

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Merge pull request #17504 from mpizza/Bug_961563_build_system

Bug 961563 - [TABLET] Support specifying target device type in Gaia build script. r=yurenju.
Merge pull request #17420 from dwi2/merge_bubbletea_971498_979212

Bubble-merge 971498 979212
Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests

This reverts commit 77b9f9e9b55801fec784dc20167c9d2a40e5346b.
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps"

This reverts commit 30a501409cbe9dce0ee318a8bb9341d2dcc10427.
Merge pull request #17527 from nucliweb/985938-Contacts-Facebook-Export

Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator