Fixing MenuTest crash.
Merge pull request #3697 from dumganhar/iss2087-new-event-dispatcher

Fixing MenuTest crash.