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 988399 - [B2G][Contacts] Contacts birthday set to January first incorrectly shows previous year
Bug 987283 -usage app cold_load_launch regressed 300ms Mar 22
Bug 975535 - E.me followups [r=ranbena]
Bug 969525 - Wrong message exporting contacts with USBStorage enabled

Fixed:
- Rewrite updateStorageOptions function for better readability
- Got rid of Settings dependency
- Tests added for export, fixed for import
Bug 988484 - [Camera] HUD blinks on startup
Bug 988441 - [Camera][Madai][Mozilla][UX] 1.4 Image Preview text should match confirmation text
Bug 971553 - [System2] Instantiable SoftwareButtonManager r=alive
Bug 989065 - [System] Fix wifi_test.js when run in its own sandbox
Bug 989104 - [email] allow for longer module load timeouts for background loads
Bug 936703 - [async_storage] callback in transaction.oncomplete event. r=djf

CostControl app invokes |Common.closeApplication()| in its
asyncStorage operation callbacks.  However, these callbacks are
invoked in IDBRequest.onsuccess events when the corresponding
transaction is not necessarily completed.  That is, we may have
following sequence:

  1) IDBRequest.onsuccess
  2) call to Common.closeApplication()
  3) invalidate open IDBDatabase
  4) trying to invoke IDBTransaction.oncomplete results in an
     AbortError.

We should follow W3C's suggestion here -- listen
IDBTransaction.oncomplete instead of IDBRequest.onsuccess.

[1]: http://www.w3.org/TR/IndexedDB/#widl-IDBTransaction-oncomplete
Merge pull request #17380 from vicamo/bugzilla/936703/call-screen-indexeddb-abort-error

Bugzilla/936703/call screen indexeddb abort error
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 #17738 from yurenju/stage-windows-squash-3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 964653 - (system-dialog) [Window Management] Implement System Dialog Window
Bug 860718 - Costcontrol plot line in graph jumps, small vertical gap between consecutive parts
Bug 960915 - (emergencycall-as-app) [LockScreen][EmergencyCall] Make EmergencyCall as an app
Merge pull request #16815 from gitmai/bug-860718-CC-plot-line-jumps

Bug 860718 - Costcontrol plot line in graph jumps, small vertical gap be...
r=salva