Merge "Handling none listener case Fix the issue: NULL pointer(mEventHandler) is accessed if the listener isn't set."