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 998845 - [System] set the last play status to STOPPED if the media app is killed before the incoming call
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