Add changes from #3931

[Alex Yang [MSFT]]

Per Brandon's comment, we need to add the "Scaffold tasks with native architecture" changes here to keep the two in sync. For reference: microsoft/vscode-docker#3931