Merge "Cleanup window_token_config_thread_safe" into main