Backport MultimediaViewer event handler fix

Change-Id: Idf16999cd9c759ed9f0656e0c4341ca66d15af24