Merge "Fix race condition for mNetworkAgent"