Merge "RCFilters: Fix highlight container selector in Watchlist overrides"