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

Change-Id: I93add5f3b7bda2139640165f9b749cb5388084e5