Merge for 1.25.2 (2nd time)#13555

sean-mcmanus merged 1 commit intoinsidersmicrosoft/vscode-cpptools:insidersfrom

mainmicrosoft/vscode-cpptools:mainCopy head branch name to clipboard