Merge "ImageReader/Writer: refactor and cleanup" into nyc-dev