Socket related cleanup
Cherry picked cleanup of various repl display stats
Merge branch 'Prod' into cleanupsock
Merge branch 'cleanupsock' into Prod