Merge "App icon view model" into main