Bug 976576 - [DSDS][SIM Manager] Change the title text for "Data" CTA
  Change the description
  from "Internet connection, MMS, A-GPS and Marketplace payments will be sent from"
  to   "Data service network and Marketplace payments"

  Added a unique string id "sim-manager-outgoing-data-description"
Bug 983079 - [MADAI][Browser] @2.25x assets update for Browser
Bug 980814 - Set system message handler when the test app is completely loaded.
Bug 993304 - [Follow up] [VRD][Homescreen] use new Buttons and Inputs [BB]
Merge pull request #17941 from kombuta/master

Bug 976576 - [DSDS][SIM Manager] Change the title text for "Data" CTA r=crh0716
Bug 977451 - [keyboard refactor] Unit test for autocorrect.js and suggestions.js
Bug 959694 - Combine Rocketbar and statusbar r=alive r=kgrandon
Merge pull request #17688 from elefant/bug/980814

Bug 980814 - Set system message handler when the test app is completely loaded.
Merge pull request #18065 from rnowm/followup_992771

Bug 993304 - [Follow up] [VRD][Homescreen] use new Buttons and Inputs [BB] r=crdlc
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
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)