Merge changes from topic "pointer-icon-refactor-mouse" into main

* changes:
  Address internal comments: Pointer icon refactor for mouse
  Pointer icon refactor for mouse (base)