Merge "Support enable/disable dns forwarding of dnsmasq"