Merge changes Ie3033144,Ib4008117 into nyc-dev

* changes:
  WebmWriter: respect track add order
  WebmWriter: do not crash on missing format keys