Merge changes I5cf75fa6,Ic24819a8 into main

* changes:
  Exclude current app & input categories frm customization
  Backend implementation of custom shortcut removal