Merge "Remove stale profile from CredentialManager" into main