Merge "Don't invoke resetLockout when not enrolled"