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
Merge branch 'v1.3' into v1.3t