WIP: Use CLock instead of std::mutex, add thread-safety annotations

WIP: Use CLock instead of std::mutex, add thread-safety annotations #554