Merge "RCFilters: Only show filter capsule as conflicted if it's selected"