am ff28e201: Display events now always carry the display id they happened on

* commit 'ff28e201ec0c6d620eaaa29814ab52958487dc31':
  Display events now always carry the display id they happened on