Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=Alive
Bug 1032702 - [v1.4] Cannot select preloaded MP3 as ringtone
Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Bug 1002327 - Make the MMI code DSDS-aware r=etienne

(cherry picked from commit 7fe1f921349c8bee9b2514972b3882ee4ae1b221)

Conflicts:
	apps/communications/dialer/locales/dialer.en-US.properties
	apps/communications/dialer/test/unit/mmi_test.js
	apps/communications/dialer/test/unit/telephony_helper_test.js
Merge pull request #20955 from weigao123/push_master

Bug 1002327 - (master) add EventListener for mmi reply. r=Etienne.
(cherry picked from commit 8b742fde1be1226931eb198997994f4297375acd)
Merge pull request #21093 from chuck-lee/bug-1010252_reconnect_issue_1.4

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge pull request #20986 from frsela/STK/Bug1027521

Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu, r=jaoo
Merge pull request #20413 from weigao123/bug980217-v1.4

Bug 980217 - (v1.4) Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=alive
Merge pull request #20396 from steveck-chung/bug-994553

Bug 994553 - [Sora][Message][Contacts]Contacts's head portrait do not display in Message. r=julienw
Conflicts:
	apps/sms/test/unit/thread_list_ui_test.js
Merge pull request #21412 from gabrielesvelto/bug-1002327-v1.4-uplift

Bug 1002327 - v1.4 uplift
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 ...
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