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 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. r=julienw
Bug 967516 - Enable DEVICE_DEBUG by default for non production builds r=ochameau
Bug 987282 - JSHint allow getter without setter globally r=julienw
Bug 984793 - [Dialer] Strip out the 1 from the phone number when long pressing voicemail. r=rik
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 987133 - Unxfail and fix test_cards_view_with_two_apps.py
Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring.
Merge pull request #17586 from gitmai/bug-987761-jshint-fix-followup-965512

Bug 987761 - Folloup up toBug 965512 - [CostControl] jshint fixes
r=jmcf
Bug 986165 - [keyboard] Hide button bubbles properly.
Merge pull request #17400 from eeejay/bug-986165

Bug 986165 - [keyboard] Hide button bubbles properly. r=rudyl
Merge pull request #17564 from chirarobert/unxfail_fix_cards_view_test_master

Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py