Revert "Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined"

This reverts commit fab38c4384733c3eed51ceaec2787c7d5962dcd3.
Bug 986329 - Fix test_settings_XXX.py with JavascriptException: TypeError: window.wrappedJSObject.Settings is undefined
Bug 975535 - [VsD Refresh] Update App Icons in Homescreen & Settings/App Permissions
Bug 984604 - Running without --restart when FTU is open does not work
Bug 984399 - Contacts list is not properly updated when importing a new FB Friend
Bug 988079 - [Calendar] day view sometimes adds duplicated days to the DOM
Bug 969101: Initial implementation of a first-time use ping. r=fabrice
Bug 971554 - [System2] Instantiable SoundManager
 Bug 971459 - [System2] Instantiable Applications.
Bug 988261 - Hide utility tray on launchapp event
Bug 963003 - Fix attention screen height on software home button shown
Bug 988754 - Fix test_call_contact.py
Bug 988399 - [B2G][Contacts] Contacts birthday set to January first incorrectly shows previous year
Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
Merge pull request #17693 from yurenju/stage-windows-squash-3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 885545 - Create Blobs for Contact photos in the VCF importer
Merge pull request #17520 from sergi/885545-photo-blob

Bug 885545 - Create Blobs for Contact photos in the VCF importer
Bug 987283 -usage app cold_load_launch regressed 300ms Mar 22
Bug 975535 - E.me followups [r=ranbena]
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" build failure

This reverts commit c965501afb3849cb1b10b0738c86fe9e450e8b9a.