am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." into lmp-mr1-dev
automerge: 422db53

* commit '422db53f8cf2fc69cdf892cb42f33021f510f207':
  Don't try to scale the bitmaps for null MediaMetadata.