Update MultimediaViewer to master

Change-Id: I35bf3fb5d03c4e4865d5830bab14a3fc7b4beaf8