am 6e66e4a9: Merge "Fix race condition for non-started fast tracks" into jb-dev

* commit '6e66e4a9ffcb202beb2bcedb85c7d6f9ff391b4c':
  Fix race condition for non-started fast tracks