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 999461 - Unxfail test_everythingme_add_collection bug Bug 995949 is fixed
Bug 999332 - Contact's name appears below the "X" button
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
Merge pull request #17906 from arcturus/bug-989923

Bug 989923 - [Contacts][Refactor] New app to host Contacts DataStore in test apps
Merge pull request #18521 from etiennesegonzac/bug-997924-callscreen-fix-visibility

Bug 997924 - Make sure the preloaded callscreen doesn't keep an audio channel open
Merge pull request #18547 from rnowm/999332

Bug 999332 - Contact's name appears below the "X" button r=joan
Merge pull request #18533 from viorelaioia/bug_999461

Bug 999461 - Unxfail test_everythingme_add_collection bug Bug 995949 is ...
Revert "Bug 973454 - [settings] refactor App permissions panel with AMD pattern" for gaia-ui test failures

This reverts commit 0fa47972d2a4c56dc17fc5a703e0147faec781be.
Bug 1000035 - Change test_import_from_gmail from xfail to disabled a=testonly r=me
Bug 973445 - [settings] refactor Sound panel with AMD pattern

- add tone tests