Merge "Add basic image writer support for app images"