Merge "ImageReader: Fix raw buffer size calculation issue"