Merge "Max brightness fix in normal brightness mode and HDR content shown" into main