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

Change-Id: Id626a44a564ae0811338bb04c3c6efb698d07b37