Merge change 358 into donut

* changes:
  Fix issue 1745312: Various cleanups in media framework