Merge "Make sure that NestedScrollView calls stopNestedScroll" into mnc-ub-dev