Merge "Fixes the animation and state when docking a task by drag" into oc-dev...
Merge "Fixes the animation and state when docking a task by drag" into oc-dev am: 008e6201 am: 71e5f8f6
am: 7f40766c
Change-Id: I584a49cf8724ca6946cc7a8db24d9a75eac5e660