Merge "Support screenshots of HDR content" into udc-dev