Merge "Fix restore not migrating to new grid"