Merge "Add missing <mutex> header"