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