Merge "Fix SwipeDismissBehavior not request disallow intercepts" into mnc-ub-dev