diff --git a/res/values/styles.xml b/res/values/styles.xml
index ce060f44677c333ebd4e47f6042ea089802a58e9..10c48df8df258a95b019c8180821a157383d55a3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -101,7 +101,7 @@
         <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
     </style>
 
-    <style name="LaunchScreenTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
+    <style name="LaunchScreenTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <item name="android:windowBackground">@drawable/quantum_launchscreen_contacts</item>
         <item name="colorPrimaryDark">@color/primary_color_dark</item>
         <item name="colorPrimary">@color/primary_color</item>
diff --git a/src/com/android/contacts/ContactsApplication.java b/src/com/android/contacts/ContactsApplication.java
index 18447696c4745906569b638613e9abba6a4446c5..fcd282f7cd17a19f85b1e05a6babb8cedc98e71e 100644
--- a/src/com/android/contacts/ContactsApplication.java
+++ b/src/com/android/contacts/ContactsApplication.java
@@ -39,6 +39,8 @@ import com.android.contactsbind.analytics.AnalyticsUtil;
 
 import com.google.common.annotations.VisibleForTesting;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 public class ContactsApplication extends Application {
     private static final boolean ENABLE_LOADER_LOG = false; // Don't submit with true
     private static final boolean ENABLE_FRAGMENT_LOG = false; // Don't submit with true
@@ -100,6 +102,7 @@ public class ContactsApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
 
         if (Log.isLoggable(Constants.PERFORMANCE_TAG, Log.DEBUG)) {
             Log.d(Constants.PERFORMANCE_TAG, "ContactsApplication.onCreate start");
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index dc6efff619d642e0e2cdf50b52a262595be30a4f..6f59389e4104f455913e7672f4bf38505d15e8dc 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -361,6 +361,7 @@ public class PeopleActivity extends AppCompatContactsActivity implements
             Log.d(Constants.PERFORMANCE_TAG, "PeopleActivity.onCreate start");
         }
 
+
         // Make sure this is *before* calling super.onCreate
         setTheme(R.style.PeopleActivityTheme);
         super.onCreate(savedState);