Merge "Update CredentialManager UI configuration." into main