Merge "Fix nullability annotations on equals methods" into main