Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev