Merge branch 'main' of https://github.com/microsoft/vscode into osortega/steady-puma