Merge changes from topic "rm-choreographer-flag" into main

* changes:
  WM mouse pointer tracking: Cleanup after PointerChoreographer refactor
  InputManager: Cleanup after PointerChoreogpraher refactor