Merge "Hide legacy icon treatment behind a flag." into ub-launcher3-master