Merge "Add JNI state change performance test"