Merge changes I65b2b48d,I0d41ba77 into main

* changes:
  [20/n Dispatcher refactor] Allow access to all TouchedWindowHandles
  [19/n Dispatcher refactor] Remove findTouchStateWindowAndDisplay