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.

Author: Steve Spear