Merge "Changing the scale factor for square icons" into ub-launcher3-calgary