Backport MultimediaViewer event handler fix

Change-Id: I888f46e72d6c1320da9b5c2fa67c84d936e5104d