Merge "Small fixes for per-display TaskAnimationManager" into main