Merge "Rename mDNS offload feature name" into main