Merge changes from topic "move_animation_options_to_change" into main

* changes:
  Enable to override AnimationOptions per change
  Move AnimationOptions to Change