Revert "RC New unlock logic for lockscreen"

This reverts commit 6405e85a558416bc50222926edfe28281ea9632c.