Merge "The new grid migration algorithm" into ub-launcher3-master