Merge "Hide hidden network spinner for non-hidden networks" into pi-dev am: cda8a44cee
am: f94119e739

Change-Id: If887d0c414649489d483bf523316d1f960798000