Merge pull request #21505 from eeejay/bug-977276

Bug 977276 - Hide dialog-overlay when screen is locked. r=timdream
Merge pull request #21511 from KDDI-tech/Bug974864_PR2

Bug 974864: [MMS]Pick recipient(email adress) up from contacts app r=julien,francisco
Revert "Merge pull request #21397 from Rik/update-xulrunner-1034565"

This reverts commit 51ce45b25eaf9cdba330aa11b77eb9dae475e98a, reversing
changes made to d681dcfa20625fb81582fae9e2b2d91ec3eb534b.
Bug 1040342 - Follow up to bug 1039199 with tests
Bug 1028253 - Camera App memory regression in FxOS
Merge pull request #21792 from davidflanagan/bug1037097

Bug 1037097: restrict image decode size in MediaFrame based on device memory size
Merge pull request #21743 from cctuan/1036788

Bug 1036788 - Stop using origins to identify apps
Bug 1039739 - Add some logging when writing the git commit id into the settings app;r=yurenju
Bug 1035062 - (Part I) Remove unused isContinousSpacePressed

remove unused variable
Bug 1035062 - (Part II) Move double tap monitoring to ActiveTargetsManager
Merge pull request #21814 from RudyLu/keyboard/Bug1039163-remove_css_popup_delay

Bug 1039163 - Remove the CSS transition delay for key popup and  highlights.
r=timdream.
Bug 1035062 - (Part III) Remove resetUpperCase()
Merge pull request #21899 from yurenju/wlach-1039739

Bug 1039739 - Add some logging when writing the git commit id into the s... r=@yurenju
Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable
Merge pull request #21807 from RudyLu/keyboard/Bug1038131-remove_selectionchange_listener

Bug 1038131 - latin.js failed to deactivate and continue to respond to
r=timdream.
Bug 1040070 - [Verical Homescreen] Use smaller images sizes for low capability devices r=crdlc

The following changes are made for low capability devices:

* Icons default to 4 per row.
* Icon resolution is reduced.
* Icon rendering does not account for devicePixelRatio.
Merge pull request #21855 from yurenju/jsonlint

Bug 1039967 - Add json lint to verify all json files in major directories in gaia r=@cctuan
Merge pull request #21661 from snowmantw/issue1036236

Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavaila...
Merge pull request #21857 from crdlc/bug-1039968

Bug 1039968 - [B2G][OTA] The icon order within pages is not preserved wh...
Bug 1039171 - Runtime decision on whether or not to run preload keyboard oop