[Home] Fix toolbar color when switching tab models

chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java

Index: chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
index 9d99441ada4b12aa8e14eac1cd214d315eb37187..c0d4eaae337cfc06d1db46967a22047f05a4ea15 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheet.java
@@ -696,8 +696,11 @@ public class BottomSheet
         mContentSwapAnimatorSet.playTogether(animators);
         mContentSwapAnimatorSet.start();
 
-        // If the existing content is null, end the animation immediately.
-        if (mSheetContent == null) mContentSwapAnimatorSet.end();
+        // If the existing content is null or the tab switcher assets are showing, end the animation
+        // immediately.
+        if (mSheetContent == null || mDefaultToolbarView.isInTabSwitcherMode()) {
+            mContentSwapAnimatorSet.end();
+        }
     }
 
     /**