Merge changes I16f37ace,I61376765 into main

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