Merge "Avoid leaking RenderEngine" into main