Merge "Don't skip animation for AE transition without split layout change" into main