Merge "Reset HUN clipping after cancellation of disappearing animation" into main