Merge "Prevent lingering divider animators in AbsSwipeUpHandler"