Bug 975265 - Add the support for LTE network types
Bug 984718 - Fix jshint errors for autocorrect.js
Bug 984718 - Fix jshint errors for boot.js
Bug 984718 - Fix jshint errors for doublespace.js
Bug 984718 - Fix jshint errors for input_field.js
Bug 984718 - Fix jshint errors for key.js
Bug 984718 - Fix jshint errors for layout.js
Bug 984718 - Fix jshint errors for page.js
Bug 985787 - Change requireApp to require to make includes work in search unit test
Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
	build/settings.js
	build/test/integration/distribution.test.js
	build/webapp-manifests.js
Merge pull request #17314 from yurenju/big920431-2

Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju
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 #17347 from qdot/985787-search-unit-test-fix

Bug 985787 - Change requireApp to require to make includes work in search unit test
Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl

This reverts commit 2e388f26d4a1b484d1fcfded068bc82d18ca4bf9.
Revert "Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong" for possibly breaking gaia-ui tests on tbpl

This reverts commit e592ec99013a43002171d1bd4be2f497c12ada88.
Revert "Bug 970028 - Nicer activity opener animation" for possibly breaking gaia-ui tests on tbpl

This reverts commit 870a91032c9d6bd84713618df0e80f0b50962488.
Revert "Bug 971556 - [System2] Instantiable SourceView." for possibly breaking gaia-ui tests on TBPL

This reverts commit 0611fa4704a77acfe2001c80afe56a98a081df77.
Revert "Bug 961800 - Implement Child Window Factory" for possibly breaking gaia-ui tests on TBPL

This reverts commit 439b23a04c6dba788293f577b1efe8c5d8843b78.
Revert "Bug 971577 - [System] Make visibility manager instantiable" for possibly breaking gaia-ui tests on TBPL

This reverts commit 73f3addd228aded613347bed46bd03a5941323d4.
Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL

This reverts commit ec5be24bd877588f60f6c64715b894157a20c603.