Merge "Use ScopedLocalRef instead of env->DeleteLocalRef" into udc-dev