[pull] main from microsoft:main#1186

pull[bot] merged 2 commits intocode:maincode/app-vscode:mainfrom

microsoft:mainmicrosoft/vscode:mainCopy head branch name to clipboard