Bug 934132 - [v1.2] Update lockscreen app and tests to be in line with master
Incorporate changes from commit 5ff9232461a9d562e0a608c4b17b08efc723145f