Backport fix for MultimediaViewer's keystroke handling

Change-Id: If635b23e3f71e8753f8bfed5cf88e0a7b359fba8