Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status
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 989722 - Draggable element in Collection is not cleared after dragend [r=ranbena]
Bug 984572 - JSHint fixes for js/*, js/utils and js/worker.
Bug 989898 - Fix email manual setup steps of gaiatest
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
Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox r=me
Merge pull request #17781 from EverythingMe/989722-dnd-cleanup

Bug 989722 - Draggable element in Collection is not cleared after dragen...
Bug 989951 - Bump gaiatest version to 0.21.10. r=fstrugariu
Merge pull request #17707 from sergi/978696

Bug 978696 - [Sora][Contacts] The vCard exported from Soul 3.5 FF can not be imported into Android devices.
Merge pull request #17796 from askeing/989898

Bug 989898 - Fix email manual setup steps of gaiatest
Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active state
Merge pull request #17814 from dmarcos/bug986882

Bug 986882 - [Camera][Madai] Color inconsistency in buttons on active st...
Bug 989974 - Disable intermittent failing unit test, system/HardwareButtons press and hold home (screen enabled) r=me
Merge pull request #17809 from davehunt/bug989951

Bug 989951 - Bump gaiatest version to 0.21.10
Merge pull request #17766 from julienw/revert-bad-revert

Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" ...
Bug 966224 - [VDR][Contacts]
Merge pull request #17800 from KevinGrandon/bug_989916_captive_portal_test_sandboxing

Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox
Bug 989663 - [Contacts] Jshint fixes for js/ r=arcturus