Merge "Proactively unparcel bitmaps in MediaMetadata" into tm-dev