Bug 997075 - NFC: a is undefined in nfc_util.js line 208. r=alive
Bug 998884 - NFC: fix jshint error for NFC files. r=alive
Bug 999163 - Clean up bootstrap mozL10n API use in FTU
Bug 994690 - Refactor config loader to use promises and add unit tests to it
Bug 997924 - Make sure the preloaded callscreen doesn't keep an audio channel open.
Bug 989923 - [Contacts][Refactor] New app to host Contacts DataStore in test apps
Bug 993686 - [B2G][Camera] - Tapping repeatedly on capture button while setting wallpaper can permanently freeze the camera app
Bug 999461 - Unxfail test_everythingme_add_collection bug Bug 995949 is fixed
Merge pull request #18462 from justindarc/bug993686

Bug 993686 - [B2G][Camera] - Tapping repeatedly on capture button while ...
Revert "Bug 962918 - Update gaia-node-modules to v1.1.7"

This reverts commit f472e0e85d5684b2ddeacb4a6f220c77f423e228.
Bug 996594 - [Camera][Madai] Settings font size - The setting text is bigger than the list of values
Merge pull request #18502 from zbraniecki/999163-cleanup-mozl10n-api-ftu

Bug 999163 - Clean up bootstrap mozL10n API use in FTU
Merge pull request #18541 from dmarcos/bug996594

Bug 996594 - [Camera][Madai] Settings font size - The setting text is bi...
Merge pull request #18215 from jmcanterafonseca/fix_utils_config

Bug 994690 - Refactor config loader to use promises and add unit tests t...
Bug 999332 - Contact's name appears below the "X" button
Bug 999537 - [Music2] Icon paths are wrong r=me
Merge pull request #18552 from KevinGrandon/bug_999537_music2_manifest_icons

Bug 999537 - [Music2] Icon paths are wrong
Merge pull request #18480 from allstarschh/Bug997075

Bug 997075 - NFC: a is undefined in nfc_util.js line 208. r=alive
Merge pull request #18485 from allstarschh/Bug998884

Bug 998884 - NFC: fix jshint error for NFC files. r=alive
Bug 993832 - wrong multi-res resource file name

Conflicts:
	apps/homescreen/everything.me/images/Wallpaper@2.25x.png