Merge "Adjust the notifyNetworkUnrequested on handleRegisterListener"