Merge "Add missing include of <mutex>" into main