Merge "JPEG/R refactor: rename jpegrecoverymap library to ultrahdr" into udc-dev