Merge "Support disableAdditionalMoreKeys and disableKeyLabelHint"
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
index 462733f..812376d 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
@@ -329,7 +329,7 @@
             } else {
                 color = mColorTypedWord;
             }
-            if (LatinImeLogger.sDBG) {
+            if (LatinImeLogger.sDBG && suggestedWords.size() > 1) {
                 // If we auto-correct, then the autocorrection is in slot 0 and the typed word
                 // is in slot 1.
                 if (index == mCenterSuggestionIndex && suggestedWords.mHasAutoCorrectionCandidate