Update MultimediaViewer for cherry-picks

Change-Id: Ibc2cc5a5af406221d7ea5317a32e0568638ea37f