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.