DNN-5542 Refactor to use shared EventHandlersContainer