Merge "Prepare for threadLoop merge - active tracks"