Merge "Add support to index ShortcutInfo as GenericDocument"