Merge "Split RenderEngineType into two enums" into main