Bug 981989 - [DSDS] Fixed dialing numbers page is not separated for 2 SIM card, which means that if set SIM 1 to enabled, same page of SIM 2 will become enabled as well even it's disabled in Call settings.

The FDN status was not refreshed in the FDN settings page, so it always would adopt the status of the last card checked for it. This patch adds a check whenever the FDN Settings panel is ready.
Bug 889830 - JavascriptException: TypeError: result[i].type r=etienne
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 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