Merge "Rename un-prefixed rcfilters selectors"