Bug 984113 - JSHint fixes for shared/test/integration/ r=julienw,djf
Merge pull request #17866 from KevinGrandon/bug_970688_settings_deviceid

Bug 970688 - Use mozSettings for Web Results deviceId parameter
Merge pull request #17662 from KevinGrandon/bug_984113_shared_integration_jshint

Bug 984113 - JSHint fixes for shared/test/integration/
Merge pull request #17841 from snowmantw/issue972791-nfc-background-missing

Bug 972791 - [NFC] landscape NFC shrinking UI background has some issue
Bug 980972 - Report a ScriptTimeout the error and have the test deal with it. r=julienw
Merge pull request #17926 from justindarc/bug987609

Bug 987609 - [Camera][Madai][UX] Gallery/preview Image number should be ...
Merge pull request #17092 from hfiguiere/bug980972

Bug 980972 - assert if we actually timeout. r=julienw
Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.
Merge pull request #17683 from gasolin/issue--971538

Bug 971538 - [System2] Instantiable PermissionManager, r=alive
Bug 990630: extract the EXIF preview metadata that media frame needs

don't parse EXIF again when creating thumbnail

Diego's README changes

update tests
Merge pull request #17930 from davidflanagan/bug990630

Bug 990630: extract the EXIF preview metadata that media frame needs r=jdarcangelo
Bug 991043 - [Gaia] [Settings] bind _responseHandler to xhr.onreadystatechange
Merge pull request #17867 from RudyLu/keyboard/Bug990372

Bug 990372 - [Sora][Message]The virtual keyboard disable after do some
r=janjongboom
Merge pull request #17862 from snowmantw/issue937442-lockscreen-window

Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen.
Revert "Bug 971538 - [System2] Instantiable PermissionManager"

This reverts commit 3b8ede8a3709430135ce557324045e9946c4486f.
Merge pull request #17909 from chirarobert/fix_system_notification

Bug 991088 - Fix test_system_notification_bar.py
Merge pull request #17816 from nucliweb/989899-Buttons-and-Input-areas-BB

Bug 989899 - [VDR][Messages] Apply Buttons and Input areas [BB] r=julien
Merge pull request #17912 from rnowm/991050

Bug 991050 - [Building Blocks] Refresh index scroll/scrubber r=pivanov
Merge pull request #17903 from julienw/991063-bail-out-early-if-getDataStores-unavailable

Bug 991063 - [Facebook] Don't fail badly when getDataStores is unavailab...
Revert "Bug 937442 - (lockscreen-window) [Window Management] Implement LockscreenWindow to manage LockScreen." for gaia unit test failures

This reverts commit 71e9afea939cca5c664dad671c9270c66384f274.