Merge "Fix NPE when re-registerNetworkCallbacks" into udc-dev