Merge "Fix crash in mediaextractor" into nyc-dev