diff --git a/res-product/values/strings.xml b/res-product/values/strings.xml
index 3fcbd7f4e63..cc22617a255 100644
--- a/res-product/values/strings.xml
+++ b/res-product/values/strings.xml
@@ -720,7 +720,7 @@
     <!-- Description for using device controls feature with a locked phone [CHAR LIMIT=NONE] -->
     <string name="lockscreen_trivial_controls_summary" product="default">Without unlocking your phone</string>
     <!-- Description for using device controls feature with a locked tablet [CHAR LIMIT=NONE] -->
-    <string name="lockscreen_trivial_controls_summary" product="tabled">Without unlocking your tablet</string>
+    <string name="lockscreen_trivial_controls_summary" product="tablet">Without unlocking your tablet</string>
 
     <!-- Accessibility summary text for auto rotate [CHAR LIMIT=NONE] -->
     <string name="auto_rotate_summary_a11y" product="default">When you move your phone between portrait and landscape</string>
diff --git a/res/drawable/button_border_selected.xml b/res/drawable/button_border_selected.xml
index 113ae0cf49d..3757517c179 100644
--- a/res/drawable/button_border_selected.xml
+++ b/res/drawable/button_border_selected.xml
@@ -18,9 +18,9 @@
        xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
        android:shape="rectangle">
     <solid
-        android:color="?androidprv:attr/materialColorPrimaryContainer" />
+        android:color="?androidprv:attr/materialColorSecondaryContainer" />
     <stroke
         android:width="1dp"
-        android:color="?androidprv:attr/materialColorOnPrimaryContainer"/>
+        android:color="?androidprv:attr/materialColorOnSecondaryContainer"/>
     <corners android:radius="@dimen/rect_button_radius" />
 </shape>
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 01f028e1684..a0dfe7f8469 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -29,8 +29,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="24dp">
+            android:orientation="vertical">
 
             <Button
                 android:id="@+id/cancelButton"
@@ -87,6 +86,7 @@
                 android:paddingStart="?attr/sudMarginStart"
                 android:paddingEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
                 android:gravity="center_vertical"/>
 
             <Button
@@ -96,8 +96,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="?attr/sudMarginStart"
                 android:layout_marginEnd="?attr/sudMarginEnd"
-                android:layout_marginTop="60dp"
-                android:layout_marginBottom="14dp"
                 android:visibility="gone"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/work_challenge_emergency_button_text"/>
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index 7997ca79d9d..fca7e75cf9c 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -61,6 +61,7 @@
                 android:layout_marginStart="?attr/sudMarginStart"
                 android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
                 android:gravity="center_vertical"/>
 
             <CheckBox
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 346cca37275..44b8d171a73 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -168,7 +168,7 @@ public class BubblePreference extends Preference implements View.OnClickListener
             mView.setSelected(selected);
 
             int colorResId = selected
-                    ? com.android.internal.R.attr.materialColorOnPrimaryContainer
+                    ? com.android.internal.R.attr.materialColorOnSecondaryContainer
                     : com.android.internal.R.attr.materialColorOnSurfaceVariant;
             ColorStateList stateList = Utils.getColorAttr(context, colorResId);
             mImageView.setImageTintList(stateList);
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 7db25fd830f..e99a986ebe6 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -17,9 +17,7 @@
 package com.android.settings.password;
 
 import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_CONFIRM_PATTERN;
 import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_LAST_PATTERN_ATTEMPT_BEFORE_WIPE;
-import static android.app.admin.DevicePolicyResources.Strings.Settings.WORK_PROFILE_PATTERN_REQUIRED;
 import static android.app.admin.DevicePolicyResources.UNDEFINED;
 
 import static com.android.settings.biometrics.GatekeeperPasswordProvider.containsGatekeeperPasswordHandle;
@@ -315,23 +313,12 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                         R.string.lockpassword_remote_validation_pattern_details);
             }
             final boolean isStrongAuthRequired = isStrongAuthRequired();
-            if (mIsManagedProfile) {
-                if (isStrongAuthRequired) {
-                    return mDevicePolicyManager.getResources().getString(
-                            WORK_PROFILE_PATTERN_REQUIRED,
-                            () -> getString(
-                                    R.string.lockpassword_strong_auth_required_work_pattern));
-                } else {
-                    return mDevicePolicyManager.getResources().getString(
-                            WORK_PROFILE_CONFIRM_PATTERN,
-                            () -> getString(
-                                    R.string.lockpassword_confirm_your_pattern_generic_profile));
-                }
-            } else {
+            if (!mIsManagedProfile) {
                 return isStrongAuthRequired
                         ? getString(R.string.lockpassword_strong_auth_required_device_pattern)
                         : getString(R.string.lockpassword_confirm_your_pattern_generic);
             }
+            return null;
         }
 
         private Object[][] getActiveViews() {
@@ -381,7 +368,9 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
 
                     CharSequence detailsText =
                             mDetailsText == null ? getDefaultDetails() : mDetailsText;
-                    mGlifLayout.setDescriptionText(detailsText);
+                    if (detailsText != null) {
+                        mGlifLayout.setDescriptionText(detailsText);
+                    }
 
                     mErrorTextView.setText("");
                     updateErrorMessage(