Merge "Adding HDR10+ Support to SF"