Merge "NestedScrollView now implements ScrollingView" into mnc-ub-dev