Merge "Rename FilterSettings to FilterConfiguration"