[Android] Java code adjustments

Various adjustments for new changes in Chromium 95

android/java/org/chromium/chrome/browser/toolbar/bottom/BottomToolbarCoordinator.java

@@ -28,6 +28,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.app.BraveActivity;
 import org.chromium.chrome.browser.app.ChromeActivity;
+import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.feature_engagement.TrackerFactory;
 import org.chromium.chrome.browser.homepage.HomepageManager;
 import org.chromium.chrome.browser.layouts.LayoutStateProvider;
@@ -256,8 +257,9 @@ class BottomToolbarCoordinator implements View.OnLongClickListener {
         }
 
         if (mScrollingBottomView != null && activity != null) {
+            Supplier<CompositorViewHolder> cvh = activity.getCompositorViewHolderSupplier();
             mScrollingBottomView.setSwipeDetector(
-                    activity.getCompositorViewHolder().getLayoutManager().getToolbarSwipeHandler());
+                    cvh.get().getLayoutManager().getToolbarSwipeHandler());
         }
     }
 

android/java/res/layout/new_tab_page_incognito.xml

@@ -60,7 +60,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/brave_new_tab_private_header"
-                android:textAppearance="@style/TextAppearance.Headline.Primary.Light" />
+                android:textAppearance="@style/TextAppearance.Headline.Primary.Baseline.Light" />
 
             <TextView
                 android:layout_width="wrap_content"