Merge "Add Mutex in FilterClient for thread-safe"