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

Change-Id: I3c2fd41ff8736b9527b6f3c31f0abc68705c5c20