Merge "Revert "Add temporary functor lifetime logging"" into jb-dev