Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Bug 981989 - [DSDS] Fixed dialing numbers page is not separated for 2 SIM card, which means that if set SIM 1 to enabled, same page of SIM 2 will become enabled as well even it's disabled in Call settings.

The FDN status was not refreshed in the FDN settings page, so it always would adopt the status of the last card checked for it. This patch adds a check whenever the FDN Settings panel is ready.
Bug 986484 - Make the outer div of contact details unscrollable
Bug 889830 - JavascriptException: TypeError: result[i].type r=etienne
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 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
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 960861 - mozMobileConnections should not be requisites for airplane ...
Revert "Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined"

This reverts commit fab38c4384733c3eed51ceaec2787c7d5962dcd3.
Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined
Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
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.