Merge "Tweak the UI display in the IPv6 address" into main