Merge "Revert "[jni] Add an overlay to indicate whether multicast ntf v..."" into main