Merge "Allow custom test app for enter and exit desktop tests" into main