Merge "Don't push handle scope for critical native generic JNI"