Bug 999110 - warning about no shutdown method in bootstrap.js for browser-helper
Bug 999155 - Clean up bootstrap mozL10n API use in Contacts
Bug 995358 - [Settings] Reorganize developer menu entries. r=arthurcc
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 998896 - Change location of play/pause in Python HTML5 player app object
Bug 999545 - Callscreen app needs write access to settings
Bug 999553 - Reenable most disabled unit tests on TBPL r=jgriffin
Bug 966323 - [B2G] Email account unrecognizable when sharing a link from the browser.
Bug 999676 - [System] Remove un-needed homescreen visibility setting r=alive
Bug 999332 - Contact's name appears below the "X" button
Bug 975535 - marketplace update to include latest icons
Bug 993832 - wrong multi-res resource file name

Conflicts:
	apps/homescreen/everything.me/images/Wallpaper@2.25x.png
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.