Merge "Hide Wi-Fi activity indicator when Wi-Fi icon is hidden" into oc-dev
am: 0b45799abc

Change-Id: I1cd5fb3d0d6ca3bbd98be741a265ef7561097d4b