[cpp] Merge setEventNotificationHandler signature fix - thanks zobo