Merge "Add temporary switch for new renderer in JNI"