Merge "Revert "Changed local refs in JNI to ScopedLocalRef"" into qt-dev