Merge "RCFilters: Change findHighlightedItem due to deprecation"