Backport fix for MultimediaViewer's keystroke handling

Change-Id: I3d13db9cdf929e1ace0e1e39cbf03ed928b9a155