Bug 980217 - Make "Skip" and "OK" buttons show when entering SIM 2 PIN code on v1.4. r=Alive
Bug 991906 - [B2G][Homescreen] Long pressing an App that opened in Landscape mode will cause the Dock apps to shift

Conflicts:
	apps/homescreen/js/grid.js
Bug 995886 - Homescreens overlap when process is killed when screen is off
Bug 1031144 - [Camera] unable to load camera on passcode lock screen when camera was launched before locking device
Merge pull request #20892 from dominickuo/bug-998956-3

Bug 998956 - [MediaDB] Ignore the time difference when it is multiple of 10 minutes and less than 12 hours, r=davidflanagan
Merge pull request #21125 from justindarc/bug1031144-v1.4

Bug 1031144 - [Camera] unable to load camera on passcode lock screen whe...
Merge pull request #18049 from etiennesegonzac/bug-993018-place-new-call-activity

Bug 993018 - Replace the "place new call" postMessages with a WebActivity r=rik
(cherry picked from commit d2a70ab329a0f85a1a7fd38c7c9297abd763ee1e)
Merge pull request #18044 from etiennesegonzac/bug-992948-sysmsg-call-log

Bug 992948 - Use the telephony-call-ended sysmsg to record calls r=rik
(cherry picked from commit 04a7f8d951d1ed8bdbe5eaea75b3204792d24fa4)
Merge pull request #20927 from comoyo/bug995886_v1_4

Bug 995886 - Homescreens overlap when process is killed when screen is off
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.