Merge "Increase the memory limit of media.extractor to 20%." into nyc-dev