Merge changes I4d2be5d9,I34706201 into oc-dr1-dev

* changes:
  Better errors from unregisterNetworkCallback
  CaptivePortalLogin correctly unregisters callbacks