RC New unlock logic for lockscreen

This fixes not being able to move the unlock button without
having a new one first. Still checks that we have one unlock
before saving.

Change-Id: I638e747c9ed3b5328334f281dbc8649c495f3d0b
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>