Merge "Fix inSampleSize != 1 gainmap decoding" into udc-dev