Merge "Add flag for HDR screenshots" into main