Restart any desktop instances started by the testrunner
Improve logic in is_android_build