Merge "RCFilters: Prevent live update fetch if model is in conflict"