Bug 831697 - White screen after receiving a call during FTU
Merge pull request #9716 from fcampo/FTU_lockscreen

Bug 831697 - White screen after receiving a call during FTU (r=etienne)
Bug 871072 - Update supl server url r=fabrice
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)
Revert Bug 831697 - White screen after a call during FTU (commit 93d938c)
Bug 831697 - White screen after receive a call in FTE
Revert "Merge pull request #9589 from lodr/bug-828298-avoid-negative-offsets"

This reverts commit 101b189e9156d30cabe42b8d893246a12ef728ac.
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 #9657 from jrburke/bug870317-unicode-escape

Bug 870317: email: fix unicode entity escaping r=asuth(cherry picked from commit 685b2a3df9764cd34bc8dca6d7bf56d40c475294)
Merge pull request #9712 from alivedise/bugzilla/870894_master/type-sm

Bug 870894 - Fix typo in sound manager, r=timdream(cherry picked from commit 303ea02c1ac3c3eb1192ba950de80f038cb0ef43)
Merge pull request #9710 from alivedise/bugzilla/871374/contentWindow-check-failed

Bug 871374 - contentWindow check for OOP apps, r=timdream, a=blocking-b2g:tef+(cherry picked from commit ba2a59237f8b1ec180f70b9a4f9f833b878c34ab)
Merge pull request #9760 from fcampo/whiteScreen-v1.0.1

Bug 831697 - White screen v1.0.1 (r=etienne)
Merge pull request #9580 from KevinGrandon/bug_867781_calendar_build_credentials

Bug 867781 - Move calendar configuration into distribution file. r=lightsofapollo(cherry picked from commit 0fc065f184e5622a24131956e5b935ebad6bfb2f)

Conflicts:
	apps/calendar/README.md
	apps/calendar/js/presets.js

Conflicts:
	Makefile
Merge pull request #9772 from lightsofapollo/only-persist-existing

Bug 872220 - Only mark permanent errors on existing accounts r=gaye
Merge pull request #9771 from lightsofapollo/use-moz-anon-again

Bug 872215 - Fix regression when mozAnon was removed.
Merge pull request #9564 from xiupinglong/master

Bug 861097 - [Buri][Beetle lite FF]The phone display date on status after power off animate  r=Alive(cherry picked from commit 74e702aa11ab85d15ddf9ca783de76e8dc498b14)
Merge pull request #9711 from huchengtw-moz/settings/Bug_868908_Layout_is_nok_on_german

Bug 868908 - [Buri][Translation][NITZ] Lay out is NOK on German.(cherry picked from commit 49a00e9a975b9b005cfbfe1dfea852cc154c4343)
Merge pull request #9532 from bakulf/wakelock

    Bug 859824 - [AudioChannel/Music App] Music App Didn't Release Wakelock When paused by AudioChannel, r=@dominickuo(cherry picked from commit 00e8ded6c27b79570020bc1add0cf6c0c6413450)
Bug 870683 - Handle SCO