Merge "RCFilters: Fix highlighted rows overlapping legend"