Merge "Disable hidden network spinner on existing networks" into pi-dev