Merge "Prevent lingering divider animators in AbsSwipeUpHandler" into sc-v2-dev