Merge changes Ic983efe6,I6eeb4aa6

* changes:
  Fix test that checks if metadata is already set
  Fix multiple-track mkv files