Bug 915643 - v2.0 [Email] Clear old notifications once Notification.get is available r=asuth a=bajaj
Bug 1064157 - Put homescreen at background while cardview is shown.
Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Revert "Merge pull request #21909 from crh0716/1038496"

This reverts commit aeb80a140fd2c29a62298658071d0ccb20063307.
Merge pull request #23639 from alivedise/bugzilla/1055299_v2.0/v4

Bug 1055299: Make visibility manager know search window, r=kgrandon
Merge pull request #24033 from alivedise/bugzilla/1064157_v2.0/v2

Bug 1064157 - Put homescreen at background while cardview is shown. r=timdream
Bug 1067705 - Action menu not show up after call screen ends
Bug 942080 - Convert asynchronous activities to use promises and use the new functionality to update old notifications r=schung

(cherry picked from commit 84a5bf6632d559bb690d2134fc4b9ef19d9b78cc)

Conflicts:
	apps/wappush/js/wappush.js
Merge pull request #23926 from jrburke/bug915643-email-clear-notifications-v2.0

Bug 915643 - v2.0 [Email] Clear old notifications once Notification.get is available r=asuth a=bajaj
Merge pull request #24233 from davidflanagan/bug1070195

Bug 1070195: free canvas memory after creating a video poster image in Camera r=wilsonpage(cherry picked from commit 3563ddca35a52e7a533dcfc7996e74b78c6e36c8)
Merge pull request #24240 from davidflanagan/bug1070195-v2.0

Merge pull request #24233 from davidflanagan/bug1070195
Bug 1060232 - [WIFI] Cannot forget AP via known network
Merge pull request #24252 from EragonJ/v2.0m-bug-1060232

Bug 1060232 - [WIFI] Cannot forget AP via known network
Merge pull request #24200 from shamenchens/Bug1067705-ActionMenuWithCallScreen

Bug 1067705 - Action menu not show up after call screen ends, r=alive
Merge branch 'v2.0' into v2.0m.
Bug-1039988 Fixing Javascript error while pressing share button in full screen mode
Bug 1065877: prevent OOMs when editing, picking and sharing large images

address review comments
Bug 1018896 - In Travis, fetch the right version of Firefox and b2g r=me a=tests
Merge pull request #24298 from julienw/1018896-v2.0-firefox-version

Bug 1018896 - In Travis, fetch the right version of Firefox and b2g r=me...
Merge branch 'v2.0' into v2.0m.