Now properly waits until after emulator is launched