Merge "RCFilters UI: Rework conflicts to be objects in filter or group context"