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 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 986753 - [Tarako] Alarm Clock can get killed in the background and never ring.
Bug 985498 - Disable intermittent failing test, test_homescreen_delete_app.py
Revert "Bug 987133 - Unxfail and fix test_cards_view_with_two_apps.py"

This reverts commit af238e5e64057a0bbf99227cffc36bf8b37135cc.
Bug 987389 - [Clock] Make time picker for timer accessible.
Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Merge pull request #17587 from mcav/clock-timeout-master

Bug 986753 - [Tarako] Alarm Clock can get killed in the background. r=jrburke
Bug 980599 - [Camera] Picture and video resolution selection
Bug 980094 - [Camera] Moving setter and enabler methods from controls view to the view base class
Bug 980290 - [Camera] Bytes and pixels shouldn't be used interchangeably
Bug 966839 - [Camera] Add frame grid to camera settings
Bug 976203 - [Camera] Localization (l10n) missing from settings UI
Bug 976203 - [Camera] Localization (l10n) missing from settings UI
Bug 976406 - [Camera] Fade viewfinder when switching between modes
Bug 979289 - [Camera] Make settings menu fullscreen