Fixed infinite loop when waiting for launcher to complete
Minor cleanup in DefaultAndroidEmulator