Merge "media: switch to using MediaImage2" into nyc-dev