Update MultimediaViewer for cherry-pick

Authored by m4tx.

Description

Update MultimediaViewer for cherry-pick

Change-Id: I144cf03dab6f15725a0e021b7abf2a2c0003fb8b