Merge "Fix race condition for non-started fast tracks" into jb-dev