Merge "Fix NativeCallbackThread race condition." into oc-mr1-dev