Fix and pimp custom lockscreen handle [1/2]

Change-Id: Id0321e0e9176f8f765980f69b412658dbb929ef3