Merge changes Icbcf21a3,Ifc558737 into main

* changes:
  Added Tests for custom shortcut registration logic
  Added logic for registering custom shortcut with InputManager