Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name
Bug 995148 - [Tarako][Gallery] Gallery exits when loading some specific pictures
Merge pull request #18362 from huchengtw-moz/gallery/Bug_995148-file-size-filter

Bug 995148 - [Tarako][Gallery] Gallery exits when loading some specific ..., r=djf
Bug 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call
Bug 991831 -[B2G][Tarako][Cost Control] The data usage bar in the notifications pull-down menu loads in slowly
Bug 988760 - Workaround for glitchy sound when playing the busytone r=etienne

(cherry picked from commit d3a918483a7342052ede64bcb5dc6c72f5356212)

Conflicts:
	build/jshint/xfail.list
Bug 991897 - [B2G][Tarako][Browser] Adding a webpage to the homescreen is not functioning correctly
Merge pull request #18488 from crdlc/bug-991897

Bug 991897 - [B2G][Tarako][Browser] Adding a webpage to the homescreen i...
Bug 991547 - Reload tabs when crashed in background. r=benfrancis
Bug 998044 - Fixing a bad merge causing the CallScreen to be init twice.
Bug 998799 - alameda.js depends toString()-ing functions

v1.3t manual merge of master commit 2abac39da5cf2c600df1a8ff25bf0d69420043b8
Merge pull request #18532 from jrburke/bug998799-1.3t-normalize-alameda-defines

Bug 998799 - alameda.js depends toString()-ing functions r=asuth,mcav a=1.3T+
Merge branch 'v1.3' into v1.3t
Merge pull request #18529 from etiennesegonzac/bug-998044-init-bis

Bug 998044 - Fixing a bad merge causing the CallScreen to be init twice.
Merge pull request #18521 from etiennesegonzac/bug-997924-callscreen-fix-visibility

Bug 997924 - Make sure the preloaded callscreen doesn't keep an audio channel open
Conflicts:

	apps/callscreen/js/index.js
	apps/system/js/dialer_agent.js
Merge pull request #18574 from leonazhao/bug997924v1.3t

Bug997924v1.3t
Merge pull request #18172 from jaoo/991628-v1.3

[v1.3] Bug 991628 - [Settings][OMA CP] Not possible to select an APN received via OMA CP message if there is already one with the same name
Merge branch 'v1.3' into v1.3t
Merge pull request #18512 from dominickuo/v1.3t-bug-998845

Bug 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call, r=alivedise
Bug 999545 - Callscreen app needs write access to settings