Merge "Fix perf regression VisualStabilityCoordinator" into main