Merge "Remove animation listeners on cancel" into main