Merge "Comparing widget sizes when sorting if the labels are same" into ub-launcher3-calgary-polish