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 992272 - Make the new Lockscreen Window Manager respond to 'lockscreen.lock-immediately'.
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