Merge "Apply Hdr transition rate only when cap is changed" into main