Merge "Reapply "Fix perf regression VisualStabilityCoordinator"" into main