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