Merge "Refactor VirtualLightRefBase & JNI"