Merge "media: correctly return cached size for MediaDataSource" into nyc-dev