Merge "Hide hidden network spinner for non-hidden networks" into pi-dev