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 984111 - JSHint fixes for shared unit test mocks
Bug 934169 - Permission dialog more info/hide info
SMS_959018_Enhanced_Suggestion_List

SMS_959018_Enhanced_Suggestion_LIst
Bug 986484 - Make the outer div of contact details unscrollable
Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
Bug 961800 - Implement Child Window Factory.

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
Merge pull request #15550 from EragonJ/bug-960861

Bug 960861 - mozMobileConnections should not be requisites for airplane ...
Bug 985948 - Empty title for contacts without name
Bug 985938 - [Contacts] Select mode checkbox is being overlaped by facebook indicator
Bug 978785 - SV: Enable customization during first time to insert a SIM card
Bug 985032 - Long press the globe key won't be able to pop up the keyboard automatically
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 971497 - [System2] Instantiable HomeGesture r=alive
Merge pull request #17404 from KevinGrandon/bug_985032_keyboard_menu

Bug 985032 - Long press the globe key won't be able to pop up the keyboard automatically
Bug 987271 - Disable intermittent failing test
Merge pull request #17164 from mcjimenez/bug978785

Bug 978785 - SV: Enable customization during first time to insert a SIM card
Merge pull request #17232 from KevinGrandon/bug_984111_shared_unit_test_jshint

Bug 984111 - JSHint fixes for shared unit test mocks r=julienw