Merge "RCFilters UI: Actually backwards-compat instead of overriding false"