Merge "Adds a new flag in ShortcutQuery to return person data"