Merge "Fix image writer for generation of app images"