Bug 968912 - Make an app object for FTU and write a test for desktopb2g/CI
Bug 984111 - JSHint fixes for shared unit test mocks
Bug 939791 - [settings] keyboard: {{type}} in mustHaveOneKeyboard is empty for text keyboards
Bug 934169 - Permission dialog more info/hide info
SMS_959018_Enhanced_Suggestion_List

SMS_959018_Enhanced_Suggestion_LIst
Bug 979914 - Investigate failure in test_cost_control_reset_wifi
Bug 985903 - Investigate test_camera_capture_video.TestCamera intermittent fail
Bug 961563 - [TABLET] Support specifying target device type in Gaia build script.
Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn
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 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
Merge pull request #17241 from crdlc/bug-983594

Bug 983594 - Avoid making several calls from detail view at the same tim...
Bug 985948 - Empty title for contacts without name
Merge pull request #17501 from viorelaioia/bug_985903

Bug 985903 - Investigate test_camera_capture_video.TestCamera intermitte...
Merge pull request #17292 from flodolo/bug939791_settingskeyboard

Bug 939791 - [settings] keyboard: {{type}} in mustHaveOneKeyboard is empty for text keyboards
Merge pull request #17516 from Archaeopteryx/crashreportsConcatSettingsUp2Date

Bug 986846 - [settings] additional white space next to 'privacy policy' link in page about crash reports. r=evelyn
Merge pull request #17500 from viorelaioia/cost_control_tests

Bug 979914 - Investigate failure in test_cost_control_reset_wifi
Merge pull request #16248 from viorelaioia/bug-968912

Bug 968912 - Make an app object for FTU
Merge pull request #17493 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button