Merge "Properly animate canceled deep shortcut drag back to original icon" into tm-dev