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

Change-Id: I5cc1c3d12ae1475d81bf6cb6ae6fff529a30839d