Merge "Remove unused ChangeId in AnimationUtils" into main