Merge "Add OldGrid field for GridOption so we can properly filter out the old grids when the flag is on" into main