Merge "Fix free-after-use for MediaHTTP" into nyc-dev