Merge "Workaround for track recreation bug" into jb-mr1-dev