Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev