Revert Bug 831697 - White screen after a call during FTU (commit 93d938c)
Bug 831697 - White screen after receive a call in FTE
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)
Bug 870683 - Handle SCO