Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status
Merge pull request #17833 from wilsonpage/bug/990285

Bug 990285 - [Camera] Resolutions should not be shown in settings menu
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
Merge pull request #16398 from dominickuo/bug-973831

Bug 973831 - [Music] also check MusicComms.enabled when checking SCO status, r=jimporter
Merge pull request #17835 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.
Bug 988677 - Fix MCC/MNC dual SIM detection in Marketplace app