Merge "Do not leak objects created from JNI" into sc-dev