Merge "RCFilters UI: Highlight behavior"