am 7a9328a3: Merge "Add temporary functor lifetime logging" into jb-dev

* commit '7a9328a3118725389564fe2a9b926837fa3d58a9':
  Add temporary functor lifetime logging