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
Revert "Merge pull request #21239 from russnicoletti/bug-1028835_v1.4"

This reverts commit 53a4ff9264d601ea963ead1a58e810c39580c0aa, reversing
changes made to bf5ad311b6a14383924d6a3898c650ffa4525840.
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.