Merge "Replace Utils.CredentialType with PromptKind." into main