quick changes to how the unlock under lockscreen works
merged