Merge changes Ib99310a4,I3bae98bc into main

* changes:
  ModifierShortcutTest improvement
  Add flag for making ModifierShortcutManager multiuser aware.