Merge "Adding support in IconProvider for loading different icons for UI and model use" into ub-launcher3-dorval-polish