Merge "RCFilters: Unify 'highlight' and 'selected' items"