Merge "Refactor GridSizeMigrationTaskV2" into tm-qpr-dev