Merge "ExternalCamera: Fix a deadlock crash using std::thread" into main