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