Merge changes I28f7e3e6,I30450d13 into main

* changes:
  Fix existing DND Settings shortcuts to point to Modes
  Refactor shortcut updating, and do it on BOOT_COMPLETE