Merge "Fix the system_error while calling thread::join() in NativeCallbackThread."