Bug 1045345 - Use existing strings for the upgrade tutorial
Bug 1045345 - fix icon positioning
Merge pull request #22431 from nullaus/v2.0

Merge pull request #22372 from nullaus/bug1046565
Merge pull request #22378 from mikehenrty/bug-1045345-fix-background

Bug 1045345 fix background
rebasefxa system UI fixes to v2.0
Merge pull request #22282 from mikehenrty/bug-1038988-reland-wallpaper

Bug 1038988 - Use fast path to GPU for wallpaper (reland)
Conflicts:
	apps/system/style/statusbar/statusbar.css
	apps/system/style/system/system.css
Merge pull request #22374 from davidflanagan/bug1039943

Bug 1039943: make gallery exit if it goes to background while scanning o... r=pdahiya(cherry picked from commit 63a273c6d1bfb2b939718c7262a9e45d92ce9a89)
Merge pull request #22435 from davidflanagan/bug1039943-v2.0

Merge pull request #22374 from davidflanagan/bug1039943
Merge pull request #22437 from johngruen/bug-1013522-firefox-account-ui-should-match

FxA system UI fixes rebased for v2.0
Bug 1046254 - [B2G][Homescreen] Unable to launch apps after moving them to the bottom row r=aus

Conflicts:
	apps/sharedtest/test/unit/elements/gaia_grid/gaia_grid_test.js
Revert "Merge pull request #22282 from mikehenrty/bug-1038988-reland-wallpaper"

This reverts commit 6b967ae73dd7fdeb08520d153fa33b7ac2bc9f80.
Bug 1034570 - Notify the user if initial registration fails r=
Bug 1042478: AirplaneModeHelper.ready is invoked several times.
Merge pull request #22382 from crh0716/1046068

Bug 1046068 - Add the default value for mms delivery report
Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
Merge pull request #22450 from mozmark/bug1034570-v2.0-uplift

Bug 1034570 - Notify the user if initial registration fails r=gerard-majax
Bug 1043293 - [Verticalhome] use "touchend" instead of "click" to launch applications r=kgrandon

* attach the scroll event on the main window
* remove stopImmediatePropagation from some locations so that the contextmenu
  event can be received by the grid
* if the event is defaultPrevented, we don't do the default action, that is
  neither drag&drop (edit mode) or launch an app
Merge pull request #20461 from justindarc/bug1024753

Bug 1024753 - [Camera] Add Camera app to whitelistedUnifiedApps
Conflicts:
	tests/performance/startup_events_test.js
Bug 1034560 - Utility tray is closed when the airplanemode button is

pressed
Merge pull request #22483 from lodr/bug-1048201-fix-typo-preventing-stk-command

Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
r=frsela
r=alive