Merge "Adding grid_migration_fix and narrow_grid_restore flag" into main