Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev