Bug 983074 - [MADAI][SMS] @2.25x assets update for SMS
Bug 975343 - Show multiple phone numbers and iccids on dual sim devices
Bug 991927 - Create new CustomEvent objects rather than caching them, to avoid entraining their most recent target and preventing it from being GCed.
Bug 991444 - [camera][madai] geo-location dialogue not full screen in camera
Bug 983079 - [MADAI][Browser] @2.25x assets update for Browser
Bug 992162 - [master] Fix test_lockscreen_unlock_to_camera_with_passcode.TestCameraUnlockWithPasscode
Bug 975268: [System][NFC] Reset the screen idle timeout when a NFC tag/device is detected. r=alive
Bug 987237 - Add option to display appIcon in cards; make screenshot preview in cards a settings option. r=alive

* New default/fallback icon for card view

* Use span for fallback cards view icon

* Move early return to ensure non-screenshot cards still get rotation class

* Implement cards view icon as overlay and fallback when screenshot setting is false, or retrieval fails

* Fix up getIconURI per bug 988128

* Add screenshot cards view setting to developer menu, with initial/default setting value as true

* Add tests for enabled and disabled screenshot handling in cards view

* Add some getIconURI tests

* Use SettingsListener to awatch screenshots.enabled setting; update test
Bug 977451 - [keyboard refactor] Unit test for autocorrect.js and suggestions.js
Bug 959694 - Combine Rocketbar and statusbar r=alive r=kgrandon
Bug 914414 - Refactor l10n.js. r=vingtetun
Merge pull request #18051 from benfrancis/959694-master2

Bug 959694 - Combine Rocketbar and statusbar r=alive r=kgrandon
Bug 980701 - Make sure we do not try to place more than two calls

We cannot open more than two lines, and mozTelephony is not able yet to
tell us that we are doing this. So we do a check ourself for now, and
bug 990472 should fix it at mozTelephony level.
Merge pull request #17677 from timdream/keyboard2-autocorrect-test

Bug 977451 - [keyboard refactor] Unit test for autocorrect.js and suggestions.js, r=janjongboom
Bug 993364 - [E.me] [un-xfail] etmmanager.js [r=ranbena]
Bug 993368 - [E.me] [un-xfail] Collections.js [r=ranbena]
Merge pull request #18021 from steveck-chung/Browser-2.25X

Bug 983079 - [MADAI][Browser] @2.25x assets update for Browser r=benfrancis
Merge pull request #17982 from lissyx/bug980701

Bug 980701 - Make sure we do not try to place more than two calls r=etienne
Revert "Revert (manually revert) "Bug 933035 - [B2G][System][Lockscreen] The"

This reverts commit 86ff94b32e369a925b79ae16ced141c1ac36fc0e.

After confirmed this backout didn't help the bug,
I now reland the code back, and to see if it can solve the other bug
may cause by it (Bug 993281)
Merge pull request #17395 from svic/Bug_975268

Bug 975268: [System][NFC] Reset the screen idle timeout when a NFC tag/device is detected.