Revert "Redesign Resurrection Tools: reorder lockscreen settings"

This reverts commit 717fa2f7aeb1e4dac8f000f5aacf69f3ded28e06.