Merge "Fix deleter in HeifDataSource"