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