Merge "Manually control the animation LS => bouncer when dragging" into main