Merge pull request #21592 from justindarc/bug1036312

Bug 1036312 - Camera flash flashes when in background
Merge pull request #21509 from dmarcos/bug1035383

Bug 1035383 - [B2G][Camera] The user is able to use the camera when batt...
Merge pull request #21602 from RudyLu/keyboard/Bug1034210_commit

Bug 1034210 - send correct keycode for non-latin IME.
r=timdream.
Bug 1035084 - The statusbar disappears from lockscreen
Merge pull request #21624 from Rik/find-contacts-when-removing-1029581

Bug 1029581 - Contact name is not shown in the call log after having two... r=drs
Conflicts:
	build/jshint/xfail.list
Merge pull request #21399 from jaoo/1016277

Bug 1016277 - If two different apps try to use the 'telephony' channel at the same time both apps can play audio. r=etienne_s
Conflicts:
	apps/callscreen/test/unit/calls_handler_test.js
Merge pull request #21520 from gitmai/bug-1032095-usage-message-with-sound

Bug 1032095 - Usage message with sound
r=salva
Merge pull request #20909 from anefzaoui/bug-1029175

Bug 1029175 - [Homescreen] Notification tray needs visual attention