Merge "Move the default shortcut types in a separate utility method." into main