Merge changes I7f8683f7,I7417c007 into main

* changes:
  Refactor processing of relative pointer movements
  Refactor PointerChoreographer lock