Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Bug 986484 - Make the outer div of contact details unscrollable
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 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau
Bug 987282 - JSHint allow getter without setter globally r=julienw
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 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers)
Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL
Revert "Merge pull request #17619 from KevinGrandon/revert_camera_features"

This reverts commit 9b093b55fd98d8a86251397a196fd9591a35a88e, reversing
changes made to c8c0c65f334a50c99638841a4593dc6394d29c62.
Bug 988118 - Gaia unit test failures on TBPL due to the camera merge
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.
Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new contact through the dialer app
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
Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
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 986531 - Xfail test_sms_with_attachments due to Bug 987809