Merge "Merge "Fixes the animation and state when docking a task by drag" into...
Merge "Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e6201" into oc-dev-plus-aosp am: ccf45069
am: 14e2bc32
Change-Id: If7de8c444e9af62e5c038fc9caf9e824f276b8e4