Merge "Do not disable toggle when Wi-Fi is enabling and disabling." into oc-dev