Merge changes Id926cb37,I86e51ab6 into main

* changes:
  Added Hardcoded Input Shortcuts
  Shortcut Helper - Connect UI layer to shortcuts