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
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
Bug 998914 - [v1.3][Settings] Cannot preselect the APN correctly if there are several APNs with the same carrier name (follow-up bug 991628)
Merge pull request #18732 from jaoo/998914-v1.3

Bug 998914 - [v1.3][Settings] Cannot preselect the APN correctly if ther...
Bug 995605 - [Sora][Message][MMS]Can't add the text in content when forward a media MMS r=schung

The issue is that in compose.js, "pointer-events: none" is added after it's
removed, in this case.

This patch ensures that SMIL.parse always calls the callback in an asynchronous way,
so that the caller does not have any surprise.
Merge pull request #18580 from etiennesegonzac/bug-997701-tone-player-channel

Bug 997701 - Set TonePlayer's channel when creating the audi element. r=gsvelto, rik
(cherry picked from commit 3617fa6b6e5e2e3c7a198227d27a12bca830ff0a)
Bug 1003023 - [Sora] OMA CP - Parse provisioning document correctly
Bug 995540: stop recording video before ringer or alarm sound is heard
Bug 1001049 - use specific version of marionette apps r=gaye a=tests
Bug 999286 - [Sora][Message]The content is lost after do some operations. r=julien
Merge pull request #18876 from azasypkin/v1.3-bug-999286-home-activity

Bug 999286 - [Sora][Message]The content is lost after do some operations. r=julien
Merge pull request #19085 from davidflanagan/bug995540

Bug 995540: stop recording video before ringer or alarm sound is heard r=dmarcos,alive
Merge pull request #18979 from gitmai/bug-1006348-app-mantain-previous-view

Bug 1006348 -[Cost control] After minimizing the app with the settings s...
Bug 999286 - [Sora][Message]The content is lost after do some operations. Fixed ActivityPicker tests. r=julien a=tests
Merge pull request #19163 from azasypkin/v1.3-fix-activity-picker-tests

Bug 999286 - [Sora][Message]The content is lost after do some operations. Fixed ActivityPicker tests. r=julien a=tests
Bug 1007608 - [sora][PTCRB][STK]Case 27.22.4.9.4/1 failed in TS 51.010-4
Merge pull request #19188 from frsela/STK/Bug1007608_v1.3

Bug 1007608 - [sora][PTCRB][STK]Case 27.22.4.9.4/1 failed in TS 51.010-4
Bug 1008061 - [OPEN C_1.3] There are two input text in "Enter NCK code" windows
Merge pull request #19143 from EragonJ/v1.3-bug-1008061

Bug 1008061 - [OPEN C_1.3] There are two input text in "Enter NCK code" windows