Merge "Revert "Make Connection threadsafe"" into lmp-dev