Merge "Add ScopedLocalRef for new Strings in JNI" into tm-dev