Update MultimediaViewer for cherry-picks

Change-Id: If66d93b3dcbae4f5438cf5ff5b287e96062b32d1