Bug 986484 - Make the outer div of contact details unscrollable
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
Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809
Merge pull request #17634 from yurenju/stage-windows-squash-2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...
Merge pull request #17635 from viorelaioia/bug_986531

Bug 986531 - Xfail test_sms_with_attachments due to Bug 987809
Merge pull request #17448 from comoyo/bug986484

Bug 986484 - Make the outer div of contact details unscrollable. r=arcturus
Bug 971458 - [System2] Instantiable AppWindowFactory