Merge "Autofill UI should still show when dataset authentication is cancelled." into oc-dev