Merge "[Thread] reduce JNI code for setting up the ICMPv6 socket" into main