Merge "Fix 'Generic.kl' file has no 'KEYCODE_FOCUS' mapping"