Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev