Revert "FW: Lockscreen rework WIP"

This reverts commit b84b1be339413edbb5402832ef610e98c0ba993e.