Merge "Fix 'Generic.kl' file has no 'ZOOM_IN' and 'ZOOM_OUT' mapping"