Merge "Do not share key mappings with JNI object" into rvc-dev