Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e620153" into oc-dev-plus-aosp