Merge "Revert "Add entry and cursor location in GetSuggestionRequest"" into tm-dev