Merge "Add feature flag to move AnimationOptions to change" into main