Merge "fix connectNetwork corner cases"