Merge "Fix regression with OverlayManagerPerfTest" into sc-dev