Merge "RCFilters UI: Followup Ic97c7c6aae7: Only add state message if item is selected"