Merge "Fix NPE when the shortcut subtype was not found."