Bug970187, CDMA-3way calls
Bug 1027429 - Honor duration in Find My Device while tracking.
Bug 1028933 - Hide the context menu ui when the homescreen is not visible. r=kgrandon
Bug 1029568 - Software Home button does not work as expected with the rocketbar opened. r=kgrandon
Bug 1021481 - Handle app protocol for DEBUG=1 mode, with port change
Bug 1029145 - [B2G][Notification]Notifications do not clear from the status bar when the related app is behind the lockscreen.
Bug 1025067 - Add 'mr', 'nb-NO', 'son' to gaia's languages_all.json
Bug 1027768 - Keep all role=system apps out of the cardview without breaking edges or the card view.
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.
Merge pull request #21024 from shamenchens/Bug1021481-App-Protocol-5

Bug1021481 Handle app protocol for DEBUG=1 mode, r=yurenju
Merge pull request #21095 from yurenju/new-languages

Bug 1025067 - Add 'mr', 'nb-NO', 'son' to gaia's languages_all.json r=pike
Bug 921939 - Support launching localised apps by name. r=bsilverberg
Merge pull request #21075 from vingtetun/bug1028933-landing

Bug 1028933 - Hide the context menu ui when the homescreen is not visibl...
Merge pull request #21048 from etiennesegonzac/bug-1027768

Bug 1027768 - Keep all role=system apps out of the cardview without breaking r=21
Merge pull request #21076 from vingtetun/bug1029568

Bug 1029568 - Software Home button does not work as expected with the ro...
Bug 1030664 - The contextmenu ui of the search app stays over results. r=kgrandon
Merge pull request #21078 from vingtetun/bug1030664

Bug 1030664 - The contextmenu ui of the search app stays over results. r...
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