Merge "Ensure that SwipeDismissBehavior affects the correct view" into mnc-ub-dev