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

# Conflicts:
#	packages/app/src/app.tsx
#	packages/app/src/index.ts
#	packages/desktop/src/main/constants.ts
#	packages/desktop/src/main/index.ts