Merge "Fix NestedScrollView intercepting touches when it shouldn't" into mnc-ub-dev