Merge changes I65daa5ac,I67a5274b into main

* changes:
  ultrahdr: revert gain map image dimension calculation
  ultrahdr: fix initialization in enc fuzzer