Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=Alive
Merge pull request #18201 from etiennesegonzac/instacallscreen

Bug 990003 - Introducing a dedicated callscreen app for better performance r=rik, alive, 21
(cherry picked from commit 7afce8a6e965a45f38988227828ccdfb315394f3)

Conflicts:
	apps/communications/dialer/js/call_log.js
	apps/system/js/attention_screen.js
	apps/system/js/bootstrap.js
	apps/system/style/attention_screen.css
	apps/system/test/unit/bootstrap_test.js
	build/csslint/xfail.list
	build/jshint/xfail.list
	build/webapp-zip.js
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
(cherry picked from commit c0e3264cf1e57d2da3ce201554b620bd3cf01d24)
Merge pull request #18537 from Rik/settings-readwrite-999545

Bug 999545 - Callscreen app needs write access to settings r=etienne
(cherry picked from commit 69c41df810a1304ee9bab956468c391472f0f792)
Merge pull request #18694 from etiennesegonzac/bug-1000047-callscreen-race

Bug 1000047 - Hardening the callscreen against a transition end race. r=rik
(cherry picked from commit d9cb98243113558e4581c6bfcb6515ae6b088620)
Merge pull request #18577 from etiennesegonzac/bug-999478-on-demand-callscreen

Bug 999478 - Free the preloaded callscreen under memory pressure
(cherry picked from commit 03da6aab8a033d83835a245c968ce4dd2f06409e)
Merge pull request #19070 from lissyx/bug1006356

Bug 1006356 - Fix setting currentChannel value r=etienne_s,rik
(cherry picked from commit 78a31887c15d26f38df0e86c3f799c0c08d4b81b)
Bug 1026474 - [dolphin][Contacts]No Error pop up when exporting contacts to SD card, while SD card is full.
Bug 1032702 - [v1.4] Cannot select preloaded MP3 as ringtone
Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge pull request #21052 from arcturus/bug-1026474

Bug 1026474 - [dolphin][Contacts]No Error pop up when exporting contacts to SD card, while SD card is full. r=jmcf
Merge pull request #21282 from etiennesegonzac/callscreen-1.4-uplift

Callscreen 1.4 uplift
Bug 1017365 - [V1.4][Dialer]The "Emergency number" is displayed as "Emergency nu..."
Merge pull request #21398 from gtorodelvalle/v1.4-dialer-bug-1017365-emergency-call-visual-discrepancies-revolutions

Bug 1017365 - [V1.4][Dialer]The "Emergency number" is displayed as "Emergency nu..."
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