Re-implement lockscreen targets [2/2]

Change-Id: I915a5f782e93e176951bb1a2ea441e639ecaf759