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

Change-Id: If1947aac627b92213202b22b721a397492173508