Merge changes I69dd162f,If07bb66a into main

* changes:
  Block addition of custom shortcuts
  Shift App launch shortcut handling to KeyGestureController