Merge "JPEG/R refactor: rename "recovery map" to "gain map"" into udc-dev