Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev