Merge changes I4db90c62,Ib32ee292 into main

* changes:
  [13/n Dispatcher refactor] Move TouchState to DispatcherTouchState
  [12/n Dispatcher refactor] Introduce static DispatcherTouchState