Merge "Fix grid migration tests with grid migration refactor flag on" into main