Merge "Extending Hdr brightness confg" into main