Merge "Fix getHdrRenderType function in OutputLayer.cpp" into main