Merge "Make sure only old grids show up when the flag is off" into main