Merge "RCFilters: Fix live update"