Merge "RCFilters: Create one single source of truth for item display"