Merge "media: Optimize thumbnail extraction." into nyc-mr1-dev