Merge "MediaCas : Add missing check to mEventHandler" into main