Merge "Do not use content light level if it's 0" into rvc-dev