Merge "Trigger IME switcher by long-pressing space key"
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index e31aa84..2e06831 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -142,7 +142,9 @@
                 keyboardView.showKey(msg.arg1, tracker);
                 break;
             case MSG_DISMISS_KEY_PREVIEW:
-                keyboardView.mPreviewText.setVisibility(View.INVISIBLE);
+                if (keyboardView.mPreviewText != null) {
+                    keyboardView.mPreviewText.setVisibility(View.INVISIBLE);
+                }
                 break;
             }
         }