Merge "Address difference in icon id with provider model" into sc-dev