keyboard stuff

Resolve miscellaneous keyboard lint warnings (#25268) master


+12 -11
9 changed files