Merge change from jb-dev to master

This is the change that fixes the random scrolling when switching
between reply/reply all

Merge of: https://android-git.corp.google.com/g/#/c/203483/1

Change-Id: I6b11016b4f48b297a2c6c40413cf6d6a52a193b4
diff --git a/src/com/android/ex/chips/RecipientEditTextView.java b/src/com/android/ex/chips/RecipientEditTextView.java
index 2011237..618c215 100644
--- a/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2136,7 +2136,7 @@
                     editable.delete(tokenStart, tokenEnd);
                     getSpannable().removeSpan(repl[0]);
                 }
-            } else {
+            } else if (count > before) {
                 scrollBottomIntoView();
             }
         }