Merge "SF: Change RenderEngine ownership"