Merge "Add hdr attributes to setSurfaceAttr"