Merge "RCFilters: Add an opt-out preference for filters on watchlist"