Merge "Fix static track activity ref counting" into jb-dev