Reorder code slightly in setupWorkingDirectory Upstream-commit: 562a1263f2ce93b649a09803659be40c61b51b35 Component: engine