Bug 989272 - FPS and TTL monitors shouldn't depend on the Developer HUD being active. r=evelyn
Bug 989880 - [Keyboard] Make demo keyboard not reflow on any key presses. r=janjongboom
Bug 992194 - Fixing a small css issue caused by a merge conflict.
Bug 992216 - s/Feura/Fira/. r=21
Bug 929027 - [Messages][Gallery] The option "Share with: Messages" are missing, when more than one file is selected r=schung

This adds a localization note for localizers.
Bug 992466 - Phone wont come back from sleep on ftu
Bug 991674 - IconRetriever fails to get icon but error callback is not executed [r=crdlc]
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 991585 - NFC: NfcUtils.encodeHandoverSelect is not a function. r=alive
Merge pull request #17998 from snowmantw/issue992466

Bug 992466 - Phone wont come back from sleep on ftu
Merge pull request #17944 from allstarschh/Bug991585

Bug 991585 - NFC: NfcUtils.encodeHandoverSelect is not a function. r=alive
Merge pull request #18008 from yurenju/stage5

Bug 897352 - [gaia build system] Transition to a build_stage for assembl...
Bug 990998 - Use correct object scope when calling _doSetRadioEnabled

Some code path to call this._doSetRadioEnabled() is not referring to the
correct object, this making the call to fail with 'this is undefined'.
Merge pull request #17983 from jankeromnes/feura

Bug 992216 - s/Feura/Fira/. r=21
Merge pull request #17801 from jankeromnes/disintegrate

Bug 989272 - FPS and TTL monitors shouldn't depend on the Developer HUD being active. r=21
Bug 988172 - Create datastore for bookmarks and extract the UI to add them to system
Merge pull request #17979 from julienw/929027-localization-comment

Bug 929027 - [Messages][Gallery] The option "Share with: Messages" are m...
Bug 989087 - Fix layout manager height
Merge pull request #17642 from crdlc/bug-988172

Bug 988172 - Create datastore for bookmarks and extract the UI to add th...
Bug 991490 - [email/backend] persistent test failure in test_compose_blobs.js due to undefined/null inconsistency in smtp/account.js. r=mcav

land https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/298