Merge "Adopt end animation callback adjustment for tests" into main