Merge "NestedScrollView onStopNestedScroll fix" into mnc-ub-dev