Merge "Make ClientLifecycleManagerTests thread safe" into main