Merge "Add support for multi tracks in WriterTest and ListenerTest"