Merge "SF: make RenderEngineThreaded::waitUntilInitialized more efficient" into main