Merge "media: fix ImageReader to handle P010 images"