Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings')
Bug 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time)
Bug 980861 -[Cost Control] Alarm should be notified when user configures when use is above or when balance is below
Bug 984265 - JSHint fixes for shared/js
Bug 971512 - [System] Instantiable layout manager
Merge pull request #17641 from rexboy7/bug-971512-1.4

Bug 971512 - [System] Instantiable layout manager
Bug 971072 - [VDR] [BB] update modals with new Buttons BB
Merge pull request #17652 from rnowm/VR-modals

Bug 971072 - [VDR] [BB] update modals with new Buttons BB r=pivanov
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 #17674 from gitmai/bug-980861-balance-notification-without-sms

Bug 980861 -[Cost Control] Alarm should be notified when user configures...
r=salva
Merge pull request #17679 from yurenju/stage-windows-squash-3

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau
Bug 982033 - change layout manager instantiate place to solve app_window dependency
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps"

This reverts commit 8126421998f0e1b0bf618f6788db7eabb26be0b8.
Merge pull request #17655 from frsela/STK/Bug988362

Bug 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time), r=timdream
Revert "Bug 930364 - standard text message sound is jarring" for gaia-unit test failure

This reverts commit e977096d3d9b5ca5818d0a3569ae1258b7a7970b.
Bug 986763 - [Camera][Madai] Very short video not saved.
Merge pull request #17694 from dmarcos/bug986763

Bug 986763 - [Camera][Madai] Very short video not saved.
Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SIM card"

- we can automatically set on differnt card in this PUK case
- add related test
- add permanentBlocked state in the other files' mapping table
Merge pull request #17692 from gasolin/issue-982033

Bug 982033 - change layout manager instantiate place to solve app_window..., r=alive
Merge pull request #17234 from gasolin/issue-984265

Bug 984265 - JSHint fixes for shared/js, r=timdream