Merge "RCFilters: restore watch/unwatch link"