Merge "Fixing crash when dragging tasks to docked state."