Bug 1032702 - [v1.4] Cannot select preloaded MP3 as ringtone
Bug 1016885 - Send a notification instead of displaying the dialer when receiving an unsolicited USSD notification r=etienne

(cherry picked from commit ddbf0e11b494fd9665545141485d0b70cab6d514)

Conflicts:
	apps/communications/dialer/js/dialer.js
	apps/communications/dialer/js/mmi.js
	apps/communications/dialer/test/unit/dialer_test.js
Bug 1016885 - Always initialize the MmiManager before sending a notification r=etienne

(cherry picked from commit c664153cd702ae1db12a485e539bae88b9bdcdea)

Conflicts:
	apps/communications/dialer/test/unit/mmi_test.js
Bug 1034455 - [v1.4] radio event will be dispatched untill radio is turned on or off thoroughly. r=EJ
Merge pull request #21366 from jimporter/ringtones-mp3-1.4

Bug 1032702 - [v1.4] Cannot select preloaded MP3 as ringtone
Merge pull request #21488 from shufang-xu/bug1033889xsf_master

 Bug 1033889 - unable to read cell broadcast message on lock screen. r=ferjmoreno,Michael Henretty
Merge pull request #21476 from gabrielesvelto/bug-1016885-v1.4-uplift

Bug 1016885 - v1.4 uplift
Bug 1019783 - Always display IMEI codes for all SIM slots r=Rik

(cherry picked from commit c329a67bafe60032820ab64b52c07c22eeff114e)

Conflicts:
	apps/communications/dialer/test/unit/dialer_test.js
Merge pull request #18168 from julienw/994622-ignore-network-errors

Bug 994622 - [Build] Ignore network error when trying to fetch the node_...
(cherry picked from commit 2f947be0ca2a64aa142c0d2e8305cc6d41f9121f)
Merge pull request #21546 from julienw/1033472-improve-node-modules-dependencies

Bug 1033472 - Gaia linter, gaia-build tests aren't using NODE_MODULES_GI...
(cherry picked from commit 10f141af83815940d1bd2b00a05c4f2e0965a0e3)
Bug 1036532 - [Flame][v1.4][Gaia::SMS] There is a horizontal line on “SIM1/2” word and "..." under “Send” word in the message send button when set a SIM card as default outgoing message. r=arnau
Merge pull request #21611 from julienw/1036532-fix-images-hd

Bug 1036532 - [Flame][v1.4][Gaia::SMS] There is a horizontal line on “SI...
Merge pull request #21606 from julienw/1033472-v1.4-improve-node-modules-dependencies

Bug 1033472 - v1.4 improve node modules dependencies a=tests
Bug 984274 - add required permission for mochitest. r=fabrice
Merge pull request #21633 from schien/bug984274-v1.4

Bug 984274 - add required permission for mochitest. r=fabrice
Bug 1033196 - When dialing the user name part which containing j/g characters would be incomplete
Bug 1028253 - Camera App memory regression in FFOS -- optimized sound resources
Merge pull request #21593 from justindarc/bug1028253-v1.4

Bug 1028253 - Camera App memory regression in FFOS
Merge pull request #21640 from Rik/callscreen-truncation-1033196

Bug 1033196 - When dialing the user name part which containing j/g chara... r=drs
Bug 1032502 - [Callscreen] Import contacts.xxx.properties l10n files into Callscreen to fix phone type label. r=etienne