Merge "Fix TvSettings code for HDR bugs" into main