Merge "RCFilters UI: Adopt conflict colors"