Uplift of #20281 (squashed) to beta

Author: brave-builds

android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java

@@ -238,9 +238,7 @@ public void onMenuDismissed() {
         mMenu.removeItem(R.id.brave_playlist_id);
         mMenu.removeItem(R.id.brave_speedreader_id);
         mMenu.removeItem(R.id.exit_id);
-        if (BraveVpnUtils.isVpnFeatureSupported(mContext)) {
-            mMenu.removeItem(R.id.request_brave_vpn_row_menu_id);
-        }
+        mMenu.removeItem(R.id.request_brave_vpn_row_menu_id);
     }
 
     @Override

android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java

@@ -248,9 +248,11 @@ public <T extends Preference> T findPreference(CharSequence key) {
     private void rearrangePreferenceOrders() {
         int firstSectionOrder = 0;
 
-        if (BraveVpnPrefUtils.shouldShowCallout() && !BraveVpnPrefUtils.isSubscriptionPurchase()
+        if (getActivity() != null && !getActivity().isFinishing()
+                && BraveVpnPrefUtils.shouldShowCallout()
+                && !BraveVpnPrefUtils.isSubscriptionPurchase()
                 && BraveVpnUtils.isVpnFeatureSupported(getActivity())) {
-            if (getActivity() != null && mVpnCalloutPreference == null) {
+            if (mVpnCalloutPreference == null) {
                 mVpnCalloutPreference = new VpnCalloutPreference(getActivity());
             }
             if (mVpnCalloutPreference != null) {
@@ -277,7 +279,8 @@ private void rearrangePreferenceOrders() {
             removePreferenceIfPresent(PREF_BRAVE_PLAYLIST);
         }
 
-        if (BraveVpnUtils.isVpnFeatureSupported(getActivity())) {
+        if (getActivity() != null && !getActivity().isFinishing()
+                && BraveVpnUtils.isVpnFeatureSupported(getActivity())) {
             findPreference(PREF_BRAVE_VPN).setOrder(++firstSectionOrder);
         } else {
             removePreferenceIfPresent(PREF_BRAVE_VPN);