Revert "RC lockscreen rework WIP"

This reverts commit 35c469f08ab26fad3e192ee2350a7d8fd22c7b68.