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

This reverts commit d47a77821487c72e65895427393be74b4d1c1f5e.