Merge "Remove HID usage mapping for stylus buttons in Generic.kl" into main