Bug 1027570 - Update testing lockscreen atom as per bug 970824.
Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in camera, there will be a cropping issue towards the end of the video
Merge pull request #20992 from justindarc/bug1014968

Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in came...
Merge pull request #20898 from zacc/bug_1027570

Bug 1027570 - Update testing lockscreen atom as per bug 970824.
Revert "Bug 1027570 - Update testing lockscreen atom as per bug 970824."

This reverts commit ddcbf3630af82f08549e35d5d1b2fa245e9049d6.