Merge "Remove one duplicate comparison from OutputConfiguration#equals" into main