Merge "Fix race between AnimationListener and DragState"