Merge changes I610545fd,I3c0d2677 into main

* changes:
  Update NoMan's ShortcutHelper to use ShortcutChangeCallback
  Add way to remove shortcut changed callbacks to shortcut service