Merge "Icon left side badging" into ub-launcher3-master