Merge "Legacy icon treatment" into ub-launcher3-master