Merge "Fix scaling + cropping in ImageDecoder"