Merge "RCFilters: refactor highlight state"