Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev