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
Change-Id: Ib2ae2bfeb84e999696a04ea2ffdee93872564edf