cherry-pick: fix computation of EventId is sensitive to inversion of "From" and "To" header values