am 5d3d12bf: Merge "Fix static track activity ref counting" into jb-dev

* commit '5d3d12bf58da5b48b1edb7c20b5d1edec0773f75':
  Fix static track activity ref counting