Merge "Update lockout state during auth session" into udc-dev