Bug 1032702 - [v1.4] Cannot select preloaded MP3 as ringtone
Bug 1035082 - [Dolphin][Camera] Cannot set a photo as a wallpaper after taking a photo
Merge pull request #21457 from justindarc/bug1035082-v1.4

Bug 1035082 - [Dolphin][Camera] Cannot set a photo as a wallpaper after ...
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
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