Merge "Handle NETWORK_NOT_FOUND event"