Merge "dumpstate: add media.metrics"