Revert^2 "Simplify PriorityNestedScrollConnection"

This reverts commit 7f60633a61a30bf859f63e8c7e9eac26ddc67d70.

Reason for revert: A fix will be applied on top of this revert

Change-Id: I405ad66f57d65bfeec98cc2ab4f98896c2f616da
7 files changed