Merge "add an onListenerDisconnected() callback to NLS" into nyc-dev