Bug 1038630 - Split Tutorial init into init, start methods. r=fcampo
Bug 1041967 - [Messages] do some safe lazy load to improve launch latency. r=julienw

Conflicts:

	apps/sms/index.html
Merge pull request #22379 from mikehenrty/bug-1038630-reland-tutorial

Bug 1038630 - Split Tutorial init into init, start methods. r=fcampo
Merge pull request #22384 from steveck-chung/message-safe-lazyloader-2.0

Bug 1041967 - [Messages] do some safe lazy load to improve launch latency. r=julienw
Bug 1042032 - Disable test_gallery_view until dwong fixes the phones
Merge pull request #22415 from viorelaioia/bug_1042032

Bug 1042032 - Disable test_gallery_view until dwong fixes the phones
Merge pull request #21504 from KevinGrandon/bug_1036053_vertical_app_uninstall_pending_test

Bug 1036053 - Intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/verticalhome/test/marionette/app_uninstall_pending_test.js
(cherry picked from commit 88dcf828237db7b699cbbcfa3e322596f7a7a626)
Merge pull request #21653 from KevinGrandon/bug_1034657_vertical_statusbar_test

Bug 1034657 - [VerticalHome] Add edit mode confirm dialog statusbar integration test
(cherry picked from commit c8392728c3bf610b9d746ddf922fb06893bff8c0)
Bug 1045345 - Use existing strings for the upgrade tutorial
Bug 1045345 - fix icon positioning
Merge pull request #22372 from nullaus/bug1046565

bug1046565 - Add system.png 60x60 for notification purposes. Update refe...
(cherry picked from commit e43382bb9c0239e9062d69f4f9f9cf8e26d41a19)
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.