Merge pull request #113757 from bruvzg/mac_nfd_ext

[macOS] Prefer user specified file extensions over OS preferred one.