Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'
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
[MADAI][Email] @2.25x assets update for Email
Bug 988296 - imsSettings-header points to messageSettings, should be imsSettings ('Message settings' vs. 'IMS settings')
Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" windows bustage

This reverts commit fdd45a31b8372e0f58de51af1856e0a381fe99fa.
Bug 984604 - Running without --restart when FTU is open does not work
Merge pull request #17632 from jmcanterafonseca/fix_date_l10n

Bug 987966 - [contacts] placeholder for date fields in add/edit mode is ...
Merge pull request #17519 from crdlc/bug-986047

Bug 986047 - [B2G][Dialer]Cannot select Add Comment when creating a new ...
Bug 985888 - [DSDS] Display currently in-use SIM cards on call buttons. r=rik
Bug-988264 - [Costcontrol] When date usage gets reset you can see a wrong screen
Bug 984399 - Contacts list is not properly updated when importing a new FB Friend
Bug 971515 - [System2] Instantiable MediaRecording
Revert "Revert "Bug 986753 - [Tarako] Alarm Clock can get killed in the background and never ring." for suspicion of breaking gaia integration tests"

This reverts commit a968d8cd00fa1f370a2ea7e3994b5bb5391affd7.
Bug 988362 - [STK]The maxlength of the inputbox didn't set corretly in GET_INPUT command. (Increment wait time)
Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event
Bug 974731 - Disable intermittent failing test, creating an event opening event in read view should display the created event in read view