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

# Conflicts:
#	packages/desktop-electron/src/renderer/webview-zoom.ts