Merge "ImageReader: fix missing pixel stride"