Bug 1028940 - Exit the edit mode when the homescreen is not visible. r=Cwiiis
Bug 1031258 - Smart collection view does not use APZ. r=kgrandon
Bug 1030248 - Use native context menu in the search app. r=kgrandon

Conflicts:
	apps/search/js/contextmenu.js
Bug 1030248 - Expand native contextmenu for the search app in order to cover the whole screen. r=kgrandon
Bug 1030219 - [Collection app] Pinned installed apps delayed rendering r=kgrandon
Revert "Bug 1030248 - Use native context menu in the search app. r=kgrandon"

This reverts commit 14dc63ba3504bee4447237c81ecf6893a115a297.
Revert "Bug 1030248 - Expand native contextmenu for the search app in order to cover the whole screen. r=kgrandon"

This reverts commit a7f0026d905873050efb128a43a97d2a65051305.
Bug 1031331 - [homescreen] Do not show the contextmenu while in edit mode. r=crdlc
Bug 1030820 - [Collection app] Retrieve more web results [r=kgrandon]
Bug 1032106 - [Vertical Homescreen] Pressing the home button returns to top after showing context menu
Bug 1025517 - [Homescreen] Search bar text box not centered vertically in container
Bug 1032557 - Synchronize logic for collections r=crdlc
Bug 1032829 - Smart Collection stop beeing added once the collection app has returned |false| (no user choice). r=kgrandon
Bug 1032885 - Prevent the permission prompt dialog to steal the focus. r=kgrandon
Bug 1031524 - Search Engine based on MNC/MCC in browser.json is not included in the Settings -> Homescreen -> Search Engine. r=benfrancis
Bug 1030248 - Use native context menu in the search app. r=kgrandon

Conflicts:
	apps/search/js/contextmenu.js
Revert "Bug 1030248 - Use native context menu in the search app. r=kgrandon"

This reverts commit 43226cf5c3ad19728a88b3786595670b6d60e5c6.
Bug 1030248 - Use native context menu in the search app. r=kgrandon
Merge pull request #21214 from RudyLu/music/Bug1032037-disable_playerTest_travis

Bug 1032037 - perma-red on Travis for Music player tests - Playback.
r=dominickuo
a=test-only
(cherry picked from commit ef1599767fb41f9a417a77a56f88c95912687a70)

Conflicts:
	shared/test/integration/travis-manifest.json