Merge "Authentication state stays on enrollment mismatch" into udc-qpr-dev