Merge pull request #18502 from zbraniecki/999163-cleanup-mozl10n-api-ftu

Bug 999163 - Clean up bootstrap mozL10n API use in FTU
Bug 999676 - [System] Remove un-needed homescreen visibility setting r=alive
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 999475 - Allows overloading SETTINGS_PATH with env variable. r=yurenju
Bug 975535 - marketplace update to include latest icons
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
Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.js
Bug 999907 - Validate wifi capabilities by checking both undifined and null. r=arthurcc
Bug 973454 - [settings] refactor App permissions panel with AMD pattern
Merge pull request #18519 from cctuan/968661-5

Bug 968661 - Extract new build module webapp-shared.js from webapp-zip.j...
Merge pull request #18022 from cctuan/973454

Bug 973454 - [settings] refactor App permissions panel with AMD pattern
Merge pull request #18558 from chuck-lee/bug-999907_wifi_help_capabilities

Bug 999907 - Validate wifi capabilities by checking both undifined and null. r=arthurcc
Revert "Merge pull request #18367 from RudyLu/keyboard/Bug993952-squash"

This reverts commit 2aa585a17b4df8ee2ae279b4ee80ff3b1ae9ab9f, reversing
changes made to fec20f4979f0dc740bf10ac5703dae70ae0e7803.
Merge pull request #18557 from gasolin/issue-993832

Bug 993832 - wrong multi-res resource file name, r=yurenju