Merge "Disable HDR screenshots" into udc-dev