Merge "Fix broken image writing on some userdata configurations."