Merge "The fallback number of columns in the grid should be 1 instead of 0." into ub-launcher3-master