Merge "Revert "Implement new external audio route."" into tm-dev