Update MultimediaViewer to master for I41b6e9753

Change-Id: Iec733e5a74cc59ca3ca392089f05024972c26da2