Merge "SF,HDR: Add HDR output type to modes" into main