Fix and pimp custom lockscreen handle [2/2]

Change-Id: I229695e3ff2277f1d6652995fb4208c8eb720319