Merge "Prevent quickscrub when swipe up has already started"