Merge "Adjust behavior of HDR transitions" into main