Bug 1043708 - Music search bar should not have gradient background
Bug 1040675 - Create mozilla-b2g32_v2_0 branched versions of marionette-client and consumer packages. r=mdas
Revert "Merge pull request #22184 from dmarcos/bug1036259master"

This reverts commit 2764488eb92e120b42a55a81d482c4f44bc3597a.
Merge pull request #22090 from dmarcos/bug1041811

[Bug 1041811] [B2G][Camera] The "Select" button is unresponsive when tak...
Conflicts:
	apps/camera/js/lib/storage.js
Merge pull request #22221 from dmarcos/bug1044317

Bug 1044317 - Can't record video - JavaScript Error: "TypeError: t is un...
Merge pull request #22235 from cctuan/1041467-M

Bug 1041467 - [MTBF] App only covers top half of the screen
Bug 1045151 - Cancel button on home screen not localized on 2.0 r=gandalf
Merge pull request #22284 from KevinGrandon/bug_1045151_homescreen_localize_v20

Bug 1045151 - Cancel button on home screen not localized on 2.0
Merge pull request #22229 from nullaus/bug1039631

bug 1039631 - Remove gradients from shared components and lockscreen.
(cherry picked from commit 80d9343cdce468eee9642829e68acc9ee0e47487)
Merge pull request #22319 from nullaus/v2.0

Merge pull request #22229 from nullaus/bug1039631
Bug 1006592 - Prevent the click handler that fetches the last called number from being executed if we've already started a dial action r=drs

(cherry picked from commit a142e47584d2a38f37cb5a02e937d006677e1c3e)

Conflicts:
	apps/sharedtest/test/unit/multi_sim_action_button_test.js
Merge pull request #22274 from sfoster/bug-1038630-tutorial-redux

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

Bug 1041967 - [Messages] do some safe lazy load to improve launch latency. r=julienw
Conflicts:
	apps/sms/index.html
Merge pull request #22207 from svic/Bug_1043856

Bug 1043856 - Increase handover timeout
Revert "Merge pull request #22177 from steveck-chung/message-safe-lazyloader" for Gip timeouts

This reverts commit f5080f3742a57233436b52de959ddb317082f31e.
Merge pull request #22241 from shamenchens/Bug1043708-MusicSearchBar

Bug 1043708 - Music search bar should not have gradient background, r=dkuo
Bug 1011033 - Wait for homescreen to be loaded when restarting B2G. r=bsilverberg
Bumped gaiatest-v2.0 version to 0.2. r=me a=test-only
Revert "Merge pull request #22207 from svic/Bug_1043856"

This reverts commit 9369f7f9a4795d7d554c6c1ddb3c7daee3e4f994.
Merge pull request #22177 from steveck-chung/message-safe-lazyloader

Bug 1041967 - [Messages] do some safe lazy load to improve launch latency. r=julienw
Conflicts:
	apps/sms/index.html