Merge changes I635d7d4c,I917e9385 into main

* changes:
  ultrahdr: Correct hdr white nits for linear input
  ultrahdr: updates to jpegr impl - 2