Merge "Fix double track thread initialization"