Merge "Add explicit <mutex> include" into main