Merge "Fix ShortcutManagerTest1 tests" into main