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 988760 - Workaround for glitchy sound when playing the busytone r=etienne

(cherry picked from commit d3a918483a7342052ede64bcb5dc6c72f5356212)

Conflicts:
	build/jshint/xfail.list
Bug 998044 - Fixing a bad merge causing the CallScreen to be init twice.
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