Bug 974733 - [Sora][Message] We should not change panels when handling the "sending" event on the window that does not send the message r=schung

When the user presses the "send" button, we set a boolean, so
that when we receive the "sending" event, we know whether we're in the same
window.

(cherry picked from commit a8c1a5ad0936cf5c131afaf2bb5cf6b068e8535d)

Conflicts:
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/thread_ui_test.js
Bug 981427 - Hide keyboard immediately whenever app is launched
Revert "Bug 894744 - Use localStorage event to make inter-page communication between music app and music activity"

This reverts commit db1715fcaf132b22ebdf12873564b0cfe42699ac.
Merge pull request #16745 from julienw/974733-v1.3-sending-sms-activity

Bug 974733 - [Sora][Message]The conversation message display wrong after...
Merge pull request #17288 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
Bug 975161 - Reland ensure SIM Pin inputs are visible. r=vingetun

This reverts commit 05337d2ce75651550892ca883030548ed5f7d6aa.

Conflicts:
	apps/system/test/unit/statusbar_test.js
	build/jshint/xfail.list
Merge pull request #17175 from ian-liu/bluetooth/bug981626_support_sharing_picture_and_video_simultaneously

Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously, r=@dominickuo
(cherry picked from commit 8206090c39f93b79821c6fa2dc26ee0ec3ba360b)
Merge pull request #17350 from ian-liu/v13/bluetooth/bug981626_support_sharing_picture_and_video_simultaneously

Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously, r=@dominickuo
Revert "Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button"

This reverts commit a9b63fa5001dfe7e1fa8bdffe2e4bdc5d5221027.
Merge pull request #16219 from Rik/wakelock-enabled-971761

Bug 971761 - Enable requestWakeLock in DEBUG builds to turn our tests gr... r=kgrandon
(cherry picked from commit 696150cbfdfd30ec0f78a45466035a8f3a2b3b91)

Conflicts:
	build/preferences.js
Bug 986327 - test case "test_keyboard_predictive_key.py" get failed on travis-ci
Merge pull request #17425 from yurenju/keyboard_predictive

Bug 986327 - test case "test_keyboard_predictive_key.py" get failed on t... a=testonly
Bug 986380 - fix unit test case "auth_test.js" in wappush app
Bug 986345 - Add black list on Travis.
Merge pull request #17435 from yurenju/wappush

Bug 986380 - fix unit test case "auth_test.js" in wappush app a=testonly
Merge pull request #17432 from evanxd/v1.3-bug-986345

Bug 986345 - Fix CI_ACTION=marionette_js failure on 1.3/1.3t branch. a=testonly
Bug 976935 - Use a stub rather than a spy for the Notification constructor. v2
Merge pull request #17455 from KevinGrandon/v1.3

Bug 986268 - Voicemail test is failing on v1.3 a=TEST_ONLY
Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts

Conflicts:
	apps/communications/contacts/test/marionette/details_test.js
	shared/test/integration/tbpl-manifest.json
Merge pull request #17460 from KevinGrandon/bug_982260_to_1dot3

Bug 982260 - Gaia-integration tests on TBPL fail with: TEST-UNEXPECTED-FAIL | Contacts > Details Merging 15 contacts