Merge "Remove the notion of "active track" from mixer"