Merge "Add resources owners to core/jni and split-select"