Merge "Fix a race condition in NativeDaemonConnector"