Merge "ShortcutHelper: fix UnsupportedOperationException when merging shortcuts" into main