Merge "Introduce an IconsContentProvider." into rvc-dev