Merge "Use updated NetworkEventDispatcher API" into sc-dev