Merge "[CredentialsTest] Remove captureDisplay" into main