Merge "Revert "Fix Framework code for HDR bugs"" into main