Merge "IconNormalizer cleanup" into ub-launcher3-master