Bug 1020166 - Update test_mmi.py/test_settings_device_info to handle new test data structure/dual imei
Merge pull request #21559 from chuck-lee/bug-1019146

Bug 1019146 - Set default EAP mode in FTU to PEAP. r=fcampo a=2.0+
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
Bug 1019289 - Update FTU tutorial videos. r=me
Bug 1019289 - Updated videos including missing 2.25x, via epang. r=me
Merge pull request #21631 from etiennesegonzac/bug-1030433

Bug 1030433 - Always open target=_blank links/window.open outside of the app r=alive
Bug 1035321 - Send the accuracy of locations to Find My Device's server.

This also imports mock_l10n.js from bug 1004973, since the tests introduced
in this patch depend on that file.
Bug 1029581 - Re-add value_selector.js and wallpaper.js to jshint whitelist.
Revert "Merge pull request #21602 from RudyLu/keyboard/Bug1034210_commit"

This reverts commit a00bc5797ccf693a13a32572252bab410f72f30e.
Merge pull request #21708 from guilherme-pg/bug1035321-v2.0

Bug 1035321 - Send the accuracy of locations to Find My Device's server.
Bug 1037338 - Installed apps arent added to smart collection
Merge pull request #21706 from etiennesegonzac/bug-1029979

Bug 1029979 - TonePlayer: prevent successive trash/ensureAudio() calls from creating an AudioContext with a null channel r=gsvelto
Bug 998175 - Properly handle concurrent file transfers