Merge "RCFilters UI: Add 'remove' and 'restore defaults' to filter list"