Merge changes Ibdd75ae6,If628a505 into main

* changes:
  s/TestInputListenerMatchers.h/TestEventMatchers.h
  Move all matchers from dispatcher tests to TestInputListenerMatchers