Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=Alive
backport fix to Bug 1004138 - Add a step to cleanup_data to eliminate remembered networks
Merge pull request #20699 from dchunwong/upliftwifi

Backport fix to Bug 1004138 - Add a step to cleanup_data to eliminate remembered networks
Merge pull request #21173 from steveck-chung/bug-1022644-for-v1.3t

Bug 1022644 - [Messages] Can't open the recipient panel if there are only 2 lines of recipients. r=azasypkin(cherry picked from commit 366bf651ac320c8ccc458f08ece01f2b8aadfa1c)

Conflicts:

	apps/sms/test/unit/recipients_test.js
Bug 1028835 - [dolphin][flame] video list display abnormal for a while when switch between landscape mode and portrait mode
Merge pull request #21239 from russnicoletti/bug-1028835_v1.4

Bug 1028835 - [dolphin][flame] video list display abnormal for a while when changing orientation
Bug 987847 - Resolve timing in test_settings_wallpaper.py and re-enable
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)
Revert "Merge pull request #21239 from russnicoletti/bug-1028835_v1.4"

This reverts commit 53a4ff9264d601ea963ead1a58e810c39580c0aa, reversing
changes made to bf5ad311b6a14383924d6a3898c650ffa4525840.
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)
Merge pull request #17720 from KevinGrandon/bug_864178_test_agent_sandboxing

Bug 864178 - [TestAgent] Run each test in its own sandbox
(cherry picked from commit 57c273a5d7fb9da8a4299964a8f54ad5a709436c)
Merge pull request #17800 from KevinGrandon/bug_989916_captive_portal_test_sandboxing

Bug 989916 - [System] Fix captive_portal_test.js when run in its own sandbox
(cherry picked from commit 77a873e591bb8261130e752ba5f19164b1e23198)
Merge pull request #17729 from KevinGrandon/bug_989065_wifi_test_sandbox

Bug 989065 - [System] Fix wifi_test.js when run in its own sandbox r=alive
(cherry picked from commit a47b03757d14af9832cf34a59a6871c353a493b5)
Merge pull request #17724 from KevinGrandon/bug_989019_calendar_test_sandbox

Bug 989019 - [Calendar] Fix alarm_test.js when run in its own sandbox
(cherry picked from commit 39b307f67e8945f6ec458e72c8734c907413b14e)
Merge pull request #21239 from russnicoletti/bug-1028835_v1.4

This reverts commit e4f7bc7bc121d6351959a9578457f9d7f63d7430.
Bug 1026474 - [dolphin][Contacts]No Error pop up when exporting contacts to SD card, while SD card is full.