Merge changes I4cc652fe,I03f43442 into main

* changes:
  PriorityNestedScrollConnection: make onStop suspendable and add onCancel
  Simplify PriorityNestedScrollConnection