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

# Conflicts:
#	packages/desktop/src/main/apps.ts
#	packages/desktop/src/main/index.ts
#	packages/desktop/src/main/ipc.ts
#	packages/desktop/src/main/server.ts