Updating Multimedia Viewer to master for swat

Change-Id: Iafceedc3294317bb8725c2ee8318d414298a2dbc