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

Change-Id: If6a7101ba7055e23562b87195f35f1e068048389