Revert "FW: New unlock logic for lockscreen"

This reverts commit 02ef598e502383153d7ee5a2d7424f2d6c219290.