Merge "Revert "Revert "[jni] Add an overlay to indicate whether multica..."" into main