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