Bug 985132 - [B2G][Homescreen]Input overlap with confirmation prompt when deleting apps from the dock
Bug 934169 - Permission dialog more info/hide info
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 983885: Aggressively cleanup img/canvas in contacts.
Bug 987018 - [DSDS] Fix focus() method calling on SIM picker to hide the keyboard. 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 974253 - Set preferred network type on startup based on the user preference
Merge pull request #16477 from crh0716/974253

Bug 974253 - Set preferred network type on startup based on the user preference r=jaoo
Merge pull request #17514 from alivedise/bugzilla/961800_master_merging/child-window-factory

Bug 961800 - Implement Child Window Factory. r=etienne
Bug 974319 - MockDOMRequest and tests
Bug 974319 - Part II - Fix MockDeviceStorage and Screenshot tests
typo mock_navigator_get_device_storage
Bug 974319 - Part III - Fix storage_watcher_test.js
Bug 974319 - Part IV - Include MockDOMRequest in bluetooth_transfer_test.js
Revert "Bug 974253 - Set preferred network type on startup based on the user preference"

This reverts commit c6931e59efef682aa42ad09cab3d843669d5f8f7.
963875_Service_Currently_unavailable_message_provides_user_with_incorrect_info

963875_Service_Currently_Unavailable_messgae_provides_user_with_incorrect_info
Bug 986055 - [VDR] Update buttons and header in BB edit mode