Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status
Bug 889830 - JavascriptException: TypeError: result[i].type r=etienne
Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Bug 984800 - [MADAI][Contacts] @2.25x assets update for Contacts

Now images optimized
Bug 989283 - [Camera] [Madai] Indicators are difficult to see on dark background
Bug 989722 - Draggable element in Collection is not cleared after dragend [r=ranbena]
Bug 989247 - modify the gaiatest camera app for gaia camera change
Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen
Bug 989898 - Fix email manual setup steps of gaiatest
Bug 989905 - Fix test_lockscreen_unlock_to_emergency_call_screen.py
Bug 981510 - Define MVVM as AMD modules
Bug 989892 - fix test_call_log_all_calls.py
Bug 989418 - Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL"

This reverts commit a9aa1882f4b0e472f3686b157eb119d17ae60a91.
The original revert broke a lot of things and was not done correctly.

Conflicts:
	apps/clock/js/panels/timer/panel.html
	shared/style_unstable/input_areas.css
Merge pull request #17791 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen
Merge pull request #17793 from askeing/989247

Bug 989247 - modify the gaiatest camera app for gaia camera change
Bug 983080 - Add 2.25x icons to settings app
Merge pull request #17795 from askeing/989892

Bug 989892 - fix test_call_log_all_calls.py
Merge pull request #17798 from askeing/989905

Bug 989905 - Fix test_lockscreen_unlock_to_emergency_call_screen.py
Merge pull request #17760 from arcturus/bug-984800-2

Bug 984800 - [MADAI][Contacts] @2.25x assets update for Contacts
Merge pull request #17358 from crh0716/981510

Bug 981510 - Define MVVM as AMD modules r=evelyn