Merge "Resolve issue where incorrect grid migration logic was used when migrating to strictly taller new grid" into main