Merge changes I57d23909,If6828f95 into main

* changes:
  TestEventMatchers: bounds check pointer indexes
  CapturedTouchpadEventConverter: report relative axes