Revert "Revert "Quick Unlock (2/2)""

This reverts commit b6a16dab560a740d32db3d6a4a69411d1c7bb7a1.