Merge "Create DefaultAppsIconProvider" into main