Merge "Fixing wrong check for grid migration" into ub-launcher3-master