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.
Bug 993390 - Don't do a sync reflow if we just cleared the element
Merge pull request #17965 from dbaron/bug991927

Bug 991927 - Create new CustomEvent objects rather than caching them, to...
Bug 993388 - [Followup][Messages][Refresh] Messages Inbox edit mode
Bug 993393 - Set the correct size for first and last key without doing a sync reflow
Bug 987351 - Migrate caldav_test.js to use new "view" code.
Bug 993422. Use a specific string for ActiveSync username
Merge pull request #15985 from stasm/914414-l10njs-refactor

Bug 914414 - Refactor l10n.js. r=vingtetun
Merge pull request #17813 from evanxd/bug-987351

Bug 987351 -  Migrate caldav_test.js to use new "view" code.
Merge pull request #18055 from sfoster/patron-bambino-jet

Bug 987237 - Add option to display appIcon in cards; make screenshot pre...
Bug 991384 - [camera][madai] HDR/Flash conflict messages missing
Merge pull request #17970 from hyunacho/bug991444

Bug 991444 - [camera][madai] geo-location dialogue not full screen in ca...
Bug 976630 - [Settings] Make non-current panels hidden.
Bug 984449 - [DSDS] Unify SIM picker HTML fragment and add build support for shared/elements/ r=francisco, julienw, rik, yurenju
Merge pull request #18057 from justindarc/bug991384

Bug 991384 - [camera][madai] HDR/Flash conflict messages missing