Merge "Cancel TASKBAR_COLLAPSE/EXPAND CUJ tracking when the stash animation is cancelled" into main