Merge "Fix App Handle animation on cancelled drags" into main