Merge "Updating IconProvider API to use a single API to load icons" into main