Merge "Handle null NetworkState updates"