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
Bug 858017 -[COST CONTROL] Use Gecko native support for data usage alarms provided by NetworkStats API 2.0
Merge pull request #17192 from gitmai/bug-858017-tarako

Bug 858017 - [COST CONTROL] Use Gecko native support for data usage alar...
Revert "Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button"

This reverts commit a9b63fa5001dfe7e1fa8bdffe2e4bdc5d5221027.
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
Merge branch 'v1.3' into v1.3t
Bug 984238 - Don't kill the keyboard when when it's being launched
Bug 986327 - test case "test_keyboard_predictive_key.py" get failed on travis-ci
Merge pull request #17430 from yurenju/keyboard_predictive_key_1.3t

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 #17436 from yurenju/wappush-v1.3t

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

Bug 986345 - Fix CI_ACTION=marionette_js failure on 1.3/1.3t branch. a=testonly
Merge pull request #17422 from timdream/keyboard-mempressure-race

Bug 984238 - Don't kill the keyboard when when it's being launched +shepherd