Merge "RCFilters: Change to the new views redesign"