Merge changes from topic "new 25q2 keycodes" into main

* changes:
  Add new 25Q2 keycodes
  Cleanup old API flag for keycodes