Merge "Add image/jxl support" into main