Cherry pick appswitch fix into prerelease

Fix issue with appswitch not having environment variables - Merge into all branches

See merge request !1 (merged)

(cherry picked from commit 3ff81b7a)

d888fd6e Fix issue with appswitch not having environment variables