Clear accounts after cursors are closed

 Bug: 5240198

Change-Id: I27704c165a22cecd49a903e66055547f3bd3cb50
diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index bf96597..e2447e8 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -393,6 +393,7 @@
     public void onDestroyView() {
         super.onDestroyView();
         mGrid.setBreadcrumbController(null);
+        mGrid.clearAccounts();
         LoaderManager lm = getLoaderManager();
         lm.destroyLoader(LOADER_ACCOUNTS);
         for (int id : mBookmarkAdapters.keySet()) {
diff --git a/src/com/android/browser/view/BookmarkExpandableView.java b/src/com/android/browser/view/BookmarkExpandableView.java
index edc497b..44a123a 100644
--- a/src/com/android/browser/view/BookmarkExpandableView.java
+++ b/src/com/android/browser/view/BookmarkExpandableView.java
@@ -345,7 +345,7 @@
 
             @Override
             public void onInvalidated() {
-                notifyDataSetChanged();
+                notifyDataSetInvalidated();
             }
         };