Bug 967345 - Do a connect() after pair()
Bug 982568 - Re-enable keyboard OOP
Bug 973086 - [Music] Put nfc event registration code in ModeManager
Bug 975970 - [keyboard refactor] Convert touch_handler.js to
instantiable pattern.
Merge pull request #17236 from RudyLu/keyboard/Bug975970-instantiable_touchHandler

Bug 975970 - [keyboard refactor] Convert touch_handler.js to
r=timdream
Merge pull request #16349 from dominickuo/bug-973086

Bug 973086 - [Music] Put nfc event registration code in ModeManager, r=jimporter
Merge pull request #16643 from svic/Bug_967345

Bug 967345 - Do a connect() after pair(), r=evelyn
Bug 894744 - Use localStorage event to make inter-page communication between music app and music activity
Merge pull request #17268 from RudyLu/keyboard/Bug982568-re-enable_keyboard_OOP

Bug 982568 - Re-enable keyboard OOP.
r=timdream.
Bug 982205 - Hide the facebook oauth frame so that we dont pay during painting
Bug 969267 - [Offline Error] Add Check connectivity button, rename close to cancel button on the bottom and change the description message
Merge pull request #16366 from crdlc/bug-969267-v3

Bug 969267 - [Offline Error] Add Check connectivity button, rename close...
Merge pull request #17312 from crdlc/bug-982205

Bug 982205 - Hide the facebook oauth frame so that we dont pay during pa...
Bug 979827 - [Build] check node version of environment
Merge pull request #14531 from dwi2/bug894744

Bug 894744 - Use localStorage event to make inter-page communication...
Merge pull request #17275 from cctuan/979827

Bug 979827 - [Build] check node version of environment
Bug 971546 - [System2] Instantiable Screenshot
Bug 971577 - [System] Make visibility manager instantiable
Bug 961800 - Implement Child Window Factory

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
Bug 971556 - [System2] Instantiable SourceView.