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
Bug 971554 - [System2] Instantiable SoundManager, r=alive
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 984841 - [Messages] The cursor and the keyboard are not shown when New message screen is opened r=schung
Bug 988114 - Hardcode the sha1 we want for the gaia-node-modules. r=yuren
Bug 989470 - Fix MCC/MNC dual SIM detection in Marketplace app
Bug 988114 - Update revision for gaia-node-modules. a=kgrandon
Bug 990404 - [Camera] Can click the hidden gallery/thumbnail button during the recording
Merge pull request #17624 from hfiguiere/bug988114

Bug 988114 - Hardcode the sha1 we want for the gaia-node-modules. r=yuren,kgrandon
Merge pull request #17779 from evanxd/bug-984572

Bug 984572 - JSHint fixes for js/*, js/utils and js/worker.
Merge pull request #17823 from julienw/987445-remove-vertical-align-middle-for-icon-buttons

Bug 987445 - [B2G][SMS]Delete button behavior intermittently unexpected ...
Merge pull request #17807 from huchengtw-moz/system2/Bug_971554-reland-2

Bug 971554 - [System2] Instantiable SoundManager, r=alive
Merge pull request #17581 from gitmai/bug-984801-2.25x-assets

Bug 984801 - [MADAI][CostControl] @2.25x assets update for CostControl
r=arnau
Bug 984118 - JSHint fixes for test/unit.