Merge "Race condition in ListImageFilters tests"