Merge "Gate dhcp hostname setting behind Wifi V API flag" into main