Bug970187, CDMA-3way calls
Bug 1027429 - Honor duration in Find My Device while tracking.
Bug 1028940 - Exit the edit mode when the homescreen is not visible. r=Cwiiis
Bug 1028835 - [dolphin][flame] video list display abnormal for a while when switch between landscape mode and portrait mode
bug 1022804 - Clear all references of a successful download from the Downloads API when we take ownership. r=crdlc
Bug 1030094 - Block simlock UI and FXA UI on l10n being ready
Bug 1028452 - [Collections] Opening a smart collection is slow r=ranbena
Bug 1030597 - Show find my device signin panel if fxa fires onerror. r=arthurcc
Bug 1022644 - [Messages] Can't open the recipient panel if there are only 2 lines of recipients
Bug 1027935 - Correctly handle pending upgrades as well as pause/resume of
upgrade downloads r=kgrandon
Bug 1031105 - [Collection] Edit mode can be triggered on unbookmarked e.me apps if another e.me app is added twice to the top of that Smart Collection
Bug 1031130 - Intermittent failing test, Vertical Home - Packaged App Update update an installed app r=me
Bug 1029145 - [B2G][Notification]Notifications do not clear from the status bar when the related app is behind the lockscreen.
Revert "Merge pull request #20261 from alivedise/bugzilla/1023046_2.1/app2app-transition-finetune"

This reverts commit 67b1679554cc517a5213aa2a746de26afe977eb8, reversing
changes made to f60210825f0840f95819f47a878b165019f232e9.

Conflicts:
	apps/system/test/unit/app_window_manager_test.js
Bug 1028039 - Do not screenshot apps launched in background
(identification overlay only) to prevent misleading document.hidden
values in the apps.
Bug 921939 - Support launching localised apps by name. r=bsilverberg
Merge pull request #21009 from mnjul/bug_1029145_notifications_not_clear_when_app_lockscreen

Bug 1029145 - [B2G][Notification]Notifications do not clear from the status bar when the related app is behind the lockscreen. r=timdream
Merge pull request #19482 from davehunt/bug_921939

Bug 921939 - Support launching localised apps by name
Merge pull request #20972 from etiennesegonzac/bug-1023046-backout

Revert "Merge pull request #20261 from alivedise/bugzilla/1023046_2.1/ap...
Merge pull request #20763 from guilherme-pg/bug1027429-honor-track-duration

Bug1027429 - Honor duration for track command in Find My Device