Merge "Fix for 3124993. Crash in Browser on long press."
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index be056da..09563fc 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5018,6 +5018,9 @@
         }
 
         mLayout = mHintLayout = null;
+
+        // Since it depends on the value of mLayout
+        prepareCursorControllers();
     }
 
     /**