Merge "Fix CellContentDimensionsTest" into main