Merge "Optimize animation flows" into main