Merge "Small tweaks to swap animation" into main