Bug 971141 - make sure we don't leak memory when creating video thumbnails during scanning
Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt when deleting apps from the dock
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 983885: Aggressively cleanup img/canvas in contacts.
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 987397 - [Clock] Hide timer edit dialog.
Bug 982491 - Add parent app manifestURL if there is
Bug 986055 - [VDR] Update buttons and header in BB edit mode
Bug 986433 - [Messages][Refresh] Messages Inbox edit mode
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