Backport PR #29215 to improve keyboard layout matching
    
    This lays the ground for simplifying anaconda's keyboard layout
    handling while improving results from where they are currently.