Merge "Ensure "AppIconSelector" does not match folders." into main