Bug 910210 - Overlay.update() should accept an optional parameter to override internal counter
Bug 835243 - add a confirm window to tell users rename again

  - refactor code, take the check part befoer getting deviceInfo
  - Remove some empty lines and check nameEntered is null case
Bug 911039 - Support 3-state DNT settings
Bug 911677 - hide phone-related settings if telephony is not available
Bug 911670 - Change Wording of phonelock

- make phonelock wording more generic
Bug 882980 - Add support for CDMA call waiting
Bug 912842 - [Buri][Camera][REG]Photo does not return to its original size
Bug 901349 - "<span>" showing in the update manager
Bug 906598 - Move Keyboard settings into app itself
Bug 910018 - Lowering the data check threshold.
Bug 907757 - Give better error message for missing phone and email

When we pick a contact, we cannot filter whether they have an email or a
phone number, depending on the pick request. This might make the user
pick contacts that are invalid in this case. So we notify this with an
alert. This commit ensure that we bring better error messages in this
case.
Bug 905089 - [messages] remove the unused and dangerous WaitingScreen.update function r=borja
Update gaia-ui-tests.json; Merge pull request #1304 from sashakruglov/issue_104_video

check that video saved to sdcard
Merge pull request #11401 from gabrielesvelto/bug-882980-cdma-call-waiting

Bug 882980 - Add support for CDMA call waiting r=etienne
Bug 913540 - Lazy Loading the IccHelper in the dialer
r=ferjm
Merge pull request #12036 from etiennesegonzac/bug-913540-lazy-icc-helper

Bug 913540 - Lazy Loading the IccHelper in the dialer r=ferjm
Bug 913540 - Lazy load the IccHelper in the contacts app
Merge pull request #12029 from lodr/bug-910018-data-usage-threshold

Bug 910018 - Lowering the data check threshold.
r=arcturus
Bug 892519 - [email] Notifications - Email App Not Foreground
Merge pull request #11880 from crh0716/911039

Bug 911039 - Support 3-state DNT settings r=evelyn