Merge changes from topic "am-6cdb81c0740642b4a8cf79c1764f7c0f" into main-16k

* changes:
  Merge changes Ia6ef5a21,Ic7a74588 am: 24c96fa558
  Apply pointer capture changes only in mode POINTER_RELATIVE am: 722325c5ad