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

* commit 'ca99165a06115d453e26af0bc22074125dc9d1a2':
  Fix static track activity ref counting