Merge changes I223071a2,I7dfe648c into main

* changes:
  Print Motion/KeyEvent's eventId as a hex string
  Increase the test timeout used when waiting for events to be traced