Revert "Merge pull request #12159 from gaye/bump-marionette-deps"

This reverts commit ef6e049c11f2f255ff4fe493fe8950a6267129f2, reversing
changes made to e58cfdac65fe644dc79fb3613fdaa9d9573537ac.
Merge pull request #12164 from lightsofapollo/revert-waitfor-update

Revert "Merge pull request #12159 from gaye/bump-marionette-deps"
Bug 893554 - Installation wizard should have a hook for 3rd party keyboard application exposing its layout selections
    - add 3rd-party install flow unit test
Merge pull request #12093 from julienw/912885-use-innerhtml-instead-of-data-url

Bug 912885 - use innerHTML instead of a data-url to inject attachments i...
Bug 841269 - [email/activesync] [Inari] Hotmail account needs to __reportError bad-user-or-pass errors so we trigger UI to have the user fix their password. r=asuth, r=mcav, r=jrburke

land GELAM patches in gaia:
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/248
https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/250
Merge pull request #11885 from gitmai/bug-891729-wallpaper-customization-SIM

Bug 891729 - Wallpaper customization by SIM
Bug 914832 - Async loading support for confirm dialog
Merge pull request #12103 from KevinGrandon/bug_914832_async_confirm_dialog

Bug 914832 - Async loading support for confirm dialog r=arcturus,etienne
Merge pull request #12168 from asutherland/activesync-passwords

Bug 841269 - [email/activesync] [Inari] Hotmail account needs to __reportError bad-user-or-pass errors so we trigger UI to have the user fix their password. r=asuth, r=mcav, r=jrburke
Merge pull request #11881 from mpizza/bug_893554_IMEwizard_master

Bug 893554 - Installation wizard should have a hook for 3rd party keyboa... . r=julien
[Bug 912508] Implement "X has left the call" banner.

-------
First approach, style needed
Change approach, working with event
Style fixes
Cleaning
Moved banner to call screen
Added tests
Bug 915684: Fix for url var not in scope after refactor. r=alive
Merge pull request #12113 from fcampo/Dialer-ConfCall-bug912508

[Bug 912508] Implement "X has left the call" banner (r=etienne)
Revert "Revert "Merge pull request #12000 from nullaus/operator-variant""

This reverts commit 8b15a3359fc30f3703808763e976cfcab3812724.
Bug 898409, 898410: Fixes to operator variant

Fix writable property of navigator.mozPower, remove unused stubPower variable
Change operator variant helper from mobileConnection to iccHelper
mobileConnection seems to be unstable when the sim card is locked. This patch changes operator variant to use IccHelper for fetching mcc/mnc instead.
Bug 891725 - Added unit tests for cell broadcast and voicemail customization
Bug 891755 - Show CDMA record information
Bug 914599 - Improve Call Settings when FDN is enabled

When the Fixed Dialing Numbers options is enabled, many features are
disabled, and USSD/MMI codes fall into this set. This will thus make the
many call settings parameters getting into error state. The present
commit aims at: avoiding undefined state of the call settings, and
improving the feedback we send to user by clearly stating that call
forwaring options are unavaiable due to FDN enabled.
Merge pull request #12172 from comoyo/oop_fix

Bug 915684: Fix for url var not in scope after refactor. r=alive
Merge pull request #12158 from lissyx/bug914599

Bug 914599 - Improve Call Settings when FDN is enabled, r=kaze