Merge "Fix network state handling"