Bug 871072 - Update supl server url r=fabrice
Merge pull request #9577 from lightsofapollo/notification-wake-lock

Bug 867652 - Hold CPU locks until notification is dispatched.
Conflicts:

	apps/calendar/js/controllers/alarm.js
	apps/calendar/test/unit/controllers/alarm_test.js
Merge pull request #9500 from lightsofapollo/calendar-oauth

Bug 867747 - Calendar oauth
Conflicts:

	apps/calendar/js/ext/caldav.js
	apps/calendar/js/presets.js
	apps/calendar/js/views/modify_account.js
Merge pull request #9650 from KevinGrandon/bug_868197_account_delete_flow

Bug 868197 - Oauth account delete flow r=lightsofapollo
Merge pull request #9692 from gaye/bug-870134

Bug 870134 - Redirect back to the account select view when we get access_denied
Merge pull request #7912 from lightsofapollo/calendar-server-color

Bug 836780 - Use a default color when server does not send one.
Conflicts:

	apps/calendar/test/unit/views/week_test.js
Bug 858416 - Test gaia app for exercising device storage.

Also adjusts the settings app to use storageName instead of volumeName
since bug 858416 renamed this field.
(cherry picked from commit fdfee79fa78b767ccf4241e9e525d5e5849a8c6f)
[Bug 867514] Fix location resolving (typo!) [r=crdlc](cherry picked from commit 1c3210498bcd25b612d7f84afc232d648046becb)
Bug 870689 - Try HSP if HFP does not work
Merge pull request #9485 from crdlc/bug-867149

Bug 867149 - landscape or landscape-secondary orientation locked apps re...(cherry picked from commit 1683b36b1e5b488a9b0e95679141a0019a4e37fb)
Merge pull request #9742 from mykmelez/v1-train-867514

[Bug 867514] Fix location resolving (typo!) [r=crdlc]
Revert "Merge pull request #9589 from lodr/bug-828298-avoid-negative-offsets"

This reverts commit 4840d034ff6c677f7f2151cffa068f99b44ab6be.
Bug 847241 - Make switching to an app feel faster r=timdream

- use the event appopen instead of appwillopen to hide the card switcher; this
  makes the card switcher disappear after showing the app, and thus this is
  nicer.
- disable the transition when we want to remove "immediately" the card switcher
- add some unit tests about the card switcher showing or hiding
(cherry picked from commit 53f9e4f70911d3e083d25730490263a60041f37d)

Conflicts:
	apps/system/js/cards_view.js
	apps/system/test/unit/mock_sleep_menu.js
Bug 847241 - Make switching to an app feel faster

Last-minute follow-up: revert the change to the visibility transition, as it
made the display transition invisible.
(cherry picked from commit cb368d63abd8505b7afa9f4c1bb6a5979bb5f537)
Merge pull request #9377 from crdlc/bug-865197 a=npotb

Bug 865197 - Follow-up 861846 - Unit test fixed and added a new one r=julien
(cherry picked from commit 610a684aad80f4d1a4576b5dc1e42dfaba055346)
Bug 831697 - White screen after receive a call in FTE
Merge pull request #9761 from lodr/bug-828298-fixing-mindgap

Bug 828298 - Fixig a problem in the algorithm closing a tag in mindgap.js
r=leo.bugzilla.gaia@gmail.com(cherry picked from commit e29317b6599f4ac51e1d86366287fcc13fd4467d)
Merge pull request #8925 from fabi1cazenave/mmsSettings-bug818380

Bug 818380, Settings/MMS: replace ril.data.mms by ril.mms.mms, r=kaze(cherry picked from commit e5245ac6a56ddf8345698aed044ea8e8cfacd39d)
Merge pull request #9657 from jrburke/bug870317-unicode-escape

Bug 870317: email: fix unicode entity escaping r=asuth(cherry picked from commit 685b2a3df9764cd34bc8dca6d7bf56d40c475294)
Merge pull request #9616 from chuck-lee/bug-869843_remove_WPA_EAP_option_from_Join_hidden_network

Bug 869843 - Remove "WPA-EAP" option from "Security" menu of "Join hidden network". r=arthurcc(cherry picked from commit 5d554abd7c5f6963ed12c2d3f0161ea385b7a79a)