Merge "Remove ObjPtr from CalculateNewObjectOffsets"