Merge "Fix ImageWriter::ComputeEagerResolvedStringsCallback()."