Merge "Fix missing grid for devices that upgrade from R" into sc-dev