Merge "Support fallback key events"