Bug 888911 -  Implement an increasing lockout delay to prevent passcode guessing
Bug 878001 - Implement SNTP support (Gaia end)
Bug 912885 - use innerHTML instead of a data-url to inject attachments into iframes r=kaze
Bug 915615 - Fix ActivitiesGlue.js for returned choice checkage
Merge pull request #12160 from alivedise/bugzilla/915615/fix-activity-glue-in-desktop

Bug 915615 - Fix ActivitiesGlue.js for returned choice checkage, r=timdream
Bug 891729 - Wallpaper customization by SIM
Revert "Merge pull request #12150 from borjasalguero/oslo_actionmenu"

This reverts commit c0eda140451672f78ecb7ebc3e4c043a8c5870ad, reversing
changes made to 2257367510f87474159317ca3d9c59ee1835df05.

Reverting because it is failing one unit test
Revert "Bug 910140 - Adapt to the bluetooth API changes"

This reverts commit 8372b0e6845b36861f841b93f9a9f45d501929b5.
Merge pull request #10334 from denehs/bug_878001

Bug 878001 - Implement SNTP support (Gaia end), r=kaze
Merge pull request #12141 from pauljt/bug888911

Bug 888911 -  Implement an increasing lockout delay to prevent passcode
Bug 910140 - Adapt to the bluetooth API changes
1. Calling to new bluetooth API
2. Add support to A2DP profile in the settings APP
3. Add support to A2DP profile in the status bar
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"
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