Merge remote-tracking branch 'upstream/dev' into desktop-wsl-onboarding