Merge "Add animation override support to AE" into main