Revert "RC lockscreen rework WIP"

This reverts commit f5b071686a171d3735d49ee89f1d04b7e97a7fc7.