Merge pull request #17288 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
Revert "Merge pull request #17275 from cctuan/979827"

This reverts commit 11d6cd3d50c5a92a85a738a8de5a36932c8a89e6, reversing
changes made to ce8a5f8153d45000e39fc9e4b2b94521747015c3.
Bug 985409 -  Fix JSHint issues with test/unit/setup.js
Merge pull request #17257 from zacc/bug_983059

Bug 983059 - Wait for mozWifiManager to be ready before proceeding with ...
Merge pull request #17317 from ankit93040/943976_SMS/MMS__Attaching_Video_MMS_Prompts_Wrong_Error_Message

Bug 943976: Attaching_Video_MMS_Prompts_Wrong_Error_Message, r=schung
Merge pull request #17323 from Rik/jshint-settings-985409

Bug 985409 -  Fix JSHint issues with test/unit/setup.js r=arthur
Bug 984882 - 946874 l10n follow up. r=rik
Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.
r=gaye,janx
Merge pull request #17032 from flodolo/bug981604_timechangelanguage

Bug 981604 - [System]: Time Picker doesn't change when switching language in Settings
Merge pull request #17290 from etiennesegonzac/bug-984882-callscreen-display-l10n-followup

Bug 984882 - 946874 l10n follow up. r=rik
Merge pull request #17297 from etiennesegonzac/bug-982196-reflow-helper-upgrade

Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.
Bug 971546 - [System2] Instantiable Screenshot
Bug 971577 - [System] Make visibility manager instantiable
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
Bug 971556 - [System2] Instantiable SourceView.
Bug 970028 - Nicer activity opener animation
Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong

- update test
- change the way about how we show confirm window
Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status
Merge pull request #17215 from russnicoletti/bug982743

Bug 982743 - [B2G][Clock]Timer section's Resume button illuminates and doesn't resume timer countdown r=mcav
Merge pull request #17214 from qdot/983507-flight-mode-radio-off

Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status