Merge changes Ic2d9c7ec,Ia9f2d598 into main

* changes:
  Revert "InputDispatcher_test: Verify all consumed events are traced"
  Revert "Increase the test timeout used when waiting for events to be traced"