[release/7.0] Port workload fixes from 6.0#75486

hoyosjs merged 3 commits intodotnet:release/7.0dotnet/runtime:release/7.0from

joeloff:workload-update7joeloff/runtime:workload-update7Copy head branch name to clipboard