[WIP] Merge main and fix merge conflicts from PR #7570#8179

Copilot wants to merge 1 commit into

mainmicrosoft/testfx:mainfrom

copilot/merge-main-fix-conflicts-review-commentsmicrosoft/testfx:copilot/merge-main-fix-conflicts-review-commentsCopy head branch name to clipboard