Bug 1023329 - [VsD Refresh] Lockscreen Visual Refresh > Color overlay with notifications wrong with wallpapers chosen from gallery and camera
Bug 1016432 - [Search] Fix unit tests with a newer mocha r=kgrandon
Merge pull request #20851 from KevinGrandon/bug_1016432_to_2_dot_oh

Bug 1016432 - [Search] Fix unit tests with a newer mocha a=nbotb,test_only
Merge pull request #20800 from mnjul/bug_1023329_lockscreen_color_overlay_only_for_wallpaper_picker_v2.0

Bug 1023329 - [VsD Refresh] Lockscreen Visual Refresh > Color overlay with notifications wrong with wallpapers chosen from gallery and camera. r=gweng
Bug 1020342 - Update marionette client in gaiatest to 0.7.9
Merge pull request #20520 from RudyLu/ime/Bug1013837_ime_menu_styleUpdate

Bug 1013837 - Adjust the style of ime menu.
r=timdream.
(cherry picked from commit 495bc911fc93bd6307869793d231c11d96169778)
a=bajaj.
Revert "Bug 1027144 - Re-enable test_homescreen_move_app.py" for intermittent test failures

This reverts commit d7fd03c94aaf0791ba4c68753230a08b4ed050cd.
Merge pull request #20525 from asutherland/email-as-dev-id

Bug 825538 - [email/activesync] Need to allocate unique device ID's for multi-device access to ActiveSync. r=squib
Merge pull request #20712 from davidflanagan/bug1026846

Bug 1026846: require the type parameter for FL app view activity r=amac
Merge pull request #19762 from frsela/STK/Bug1015833

Bug 1015833 - [PTCRB][STK]27.22.4.1.1/2 DISPLAY TEXT, normal priority, Unpacked 8 bit data for Text String, screen busy case failed, r=vingtetun
Merge pull request #20792 from crh0716/1022710

Bug 1022710 - Do not update the visibility of the items when the voice type is null r=eragon
Merge pull request #20784 from crh0716/1023044

Bug 1023044 - Show the signal bar for a locked sim only when making emergency calls using the sim. r=alive
Merge pull request #20844 from guilherme-pg/bug1000173-tracking-notification

Bug 1000173 - Display User Icon in Settings When FMD is Remotely Trackin...
Conflicts:
	apps/findmydevice/js/commands.js
Revert "Merge pull request #20844 from guilherme-pg/bug1000173-tracking-notification" for gaia-unit test failures

This reverts commit 7bb5daea0f37d4371e9daa08045d45fef3b30344.
Bug 1000173 - Display User Icon in Settings When FMD is Remotely Tracking Device
Merge pull request #20912 from crh0716/1000173_v2.0

Bug 1000173 - Display User Icon in Settings When FMD is Remotely Tracking Device r=arthurcc
Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu.

Conflicts:
	apps/settings/js/findmydevice.js
	apps/settings/js/panels/root/panel.js
Merge pull request #20924 from crh0716/1022992_v2.0

Bug 1022992 - Always show Find My Device's enabled state in the root Settings menu. r=arthurcc
Bug 1028906 - [v2.0][v2.1] Marketplace launch test is failing at "set_permission('Homescreen', 'geolocation', 'deny')"
Merge pull request #20928 from AndreiH/bug_1028906

Bug 1028906 - [v2.0][v2.1] Marketplace launch test is failing at "set_pe...