Merge "Action icon should be used as a badge instead of main icon" into ub-launcher3-master