Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status
Bug 984801 - [MADAI][CostControl] @2.25x assets update for CostControl
Bug 989019 - [Calendar] Fix alarm_test.js when run in its own sandbox
Bug 960946 - [Keyboard] Change to the new sendKey API
Bug 984572 - JSHint fixes for js/*, js/utils and js/worker.
Bug 938896 - Find My Device client.
Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected when no conversations are selected r=arnau

This removes the 'vertical-align: middle' property for icon buttons.
Bug 987058 - [Camera] Expose higher resolution recorder profiles
Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rounded
Bug 971135 - [Clock] Port all Clock integration tests from Python to JavaScript. r=millermedeiros
Bug 990235 - [Clock] Localize alarm panel.
Merge pull request #17828 from mcav/reland-integration-tests

Bug 971135 - [Clock] Port all Clock integration tests from Python to Jav...
Merge pull request #17830 from eeejay/bug-990235

Bug 990235 - [Clock] Localize alarm panel. r=mcav
Merge pull request #17825 from wilsonpage/bug/989467

Bug 989467 - [Camera][Mozilla] 1.4 Video record button square is too rou...
Merge pull request #17819 from wilsonpage/bug/987058

Bug 987058 - [Camera] Expose higher resolution recorder profiles
Bug 990285 - [Camera] Resolutions should not be shown in settings menu
Merge pull request #17833 from wilsonpage/bug/990285

Bug 990285 - [Camera] Resolutions should not be shown in settings menu
Bug 974725: [B2G][NFC] Support different vcard mime types for Contacts r=alive
Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.

Conflicts:
	apps/system/js/lockscreen.js
	apps/system/test/unit/bootstrap_test.js
	tests/python/gaia-ui-tests/gaiatest/tests/functional/lockscreen/test_lockscreen_unlock_to_emergency_call_screen.py
Bug 990334 - [Calendar] Disable marionette test, marionette/today_test.js