Merge "Make NetworkEventDispatcher class final" into sc-dev