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 982491 - Add parent app manifestURL if there is
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 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo
Bug 960861 - mozMobileConnections should not be requisites for airplane ...
Bug 987915 - [settings] 'Dump layers tree' always in English/not localized, wrong data-l10n-id used (dump-layers vs. dumps-layers)
Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable
Revert "Merge pull request #17466 from marshall/ftuPing" for breaking gaia-unit tests on TBPL

This reverts commit 732a35447c7da220578fc21e10fe119c2552d662, reversing
changes made to 2f48cfaf3dcc1732c57dbc0706819e9359d79fce.
Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja
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.
Bug 988117 - GAIA UI Test will fail if convert WifiManager to WebIDL
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.