[pull] main from microsoft:main#1297

pull[bot] merged 7 commits into

code:maincode/app-vscode:mainfrom

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