Merge "media: update metrics after more measurements" into nyc-dev