Merge "Fix event relay to correctly dispatch events."