Update MultimediaViewer for cherry-picks

Change-Id: I1f303a4c141b425add40df436f3f6057be2a3ba4