Merge "Fix FilterClientCallbackImpl crash caused by race condition" into main