The most simple fix that could possibly work for #6686?

Please see #6686. 

If only the first dispatcher involved injects itself into the Event, then also clients obtaining the dispatcher from it will use the right instance in composition setups.

A problem might be that listeners won't get the dispatcher they are subscribed from Event::getDispatcher().