Merge "Fixing GridMigrationTask tests" into ub-launcher3-dorval-polish