Merge changes I197e4cfa,Ie9930437 into main

* changes:
  Create ACONFIG flag for the keyboard shortcut helper rewrite feature
  Shortcut Helper - "Scaffold" implementation