Update MultimediaViewer for cherry-picks

Change-Id: Ic8d09fc81b7cec8875637474c7838908afbd76ef