Lockscreen Tryout #2

Change-Id: I1a24927b5b9dc573d7c52fd47ca6997ec20d992d
Revert "Lockscreen Tryout #2"

This reverts commit 51eb9006e9d25fbba96972207629df2140247329.