Merge "Adjust screenshot behavior of HDR content" into udc-dev