Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status
Bug 981989 - [DSDS] Fixed dialing numbers page is not separated for 2 SIM card, which means that if set SIM 1 to enabled, same page of SIM 2 will become enabled as well even it's disabled in Call settings.

The FDN status was not refreshed in the FDN settings page, so it always would adopt the status of the last card checked for it. This patch adds a check whenever the FDN Settings panel is ready.
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 984801 - [MADAI][CostControl] @2.25x assets update for CostControl
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 984572 - JSHint fixes for js/*, js/utils and js/worker.
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
Merge pull request #17075 from sergi/981989

Bug 981989 - [DSDS] Fixed dialing numbers page is not separated for 2 SIM card, which means that if set SIM 1 to enabled, same page of SIM 2 will become enabled as well even it's disabled in Call settings.
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 989916 - [System] Fix captive_portal_test.js when run in its own sandbox r=me