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

Change-Id: I7644257bc94951f9e918aae009431a8ad0cf0de4