Merge "Revert "Register IpClient as OffloadEngine when APF supports mDNS offload"" into main