diff --git a/BoardConfig.mk b/BoardConfig.mk
index 5675bea2d2babb98c151a5194907cd55d0545c2d..997ba2f7b07bbe1e6d387d173c1147e1e51b366e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -85,6 +85,8 @@ BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
 BOARD_INCLUDE_RECOVERY_DTBO := true
 BOARD_PREBUILT_RECOVERY_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/recovery_dtbo.img
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.mt6763
+TARGET_RECOVERY_UI_MARGIN_HEIGHT := 35
+TARGET_RECOVERY_UI_MARGIN_WIDTH := 10
 
 # Releasetools
 TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)/releasetools
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 7c2539f3b6c22df850a81afe6dbb70a329ae8088..a00ee12f0b1224afd19a7b787edc2da32d739dfd 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -463,4 +463,23 @@
 
     <!-- Remote server that can provide NTP responses. -->
     <string translatable="false" name="config_ntpServer">1.android.pool.ntp.org</string>
+
+    <!-- The bounding path of the cutout region of the main built-in display.
+         Must either be empty if there is no cutout region, or a string that is parsable by
+         {@link android.util.PathParser}.
+         The path is assumed to be specified in display coordinates with pixel units and in
+         the display's native orientation, with the origin of the coordinate system at the
+         center top of the display. Optionally, you can append either `@left` or `@right` to the
+         end of the path string, in order to change the path origin to either the top left,
+         or top right of the display.
+         To facilitate writing device-independent emulation overlays, the marker `@dp` can be
+         appended after the path string to interpret coordinates in dp instead of px units.
+         Note that a physical cutout should be configured in pixels for the best results.
+         Example for a 10px x 10px square top-center cutout:
+                <string ...>M -5,0 L -5,10 L 5,10 L 5,0 Z</string>
+         Example for a 10dp x 10dp square top-center cutout:
+                <string ...>M -5,0 L -5,10 L 5,10 L 5,0 Z @dp</string>
+         @see https://www.w3.org/TR/SVG/paths.html#PathData
+    -->
+    <string name="config_mainBuiltInDisplayCutout">m 157 0.248 l -9.615 0.526 l -9.638 0.986 l -9.634 1.592 l -2.406 0.509 l -2.114 0.489 l -3.932 1.013 l -7.789 2.43 l -7.617 2.972 l -7.354 3.517 l -7 4.067 l -3.34 2.24 l -1.737 1.256 l -1.924 1.467 l -7.293 6.311 l -6.775 6.88 l -6.422 7.264 l -12.446 14.947 l -4.927 5.246 l -5.406 4.631 l -5.83 3.99 l -6.2 3.323 l -6.51 2.63 l -6.766 1.911 l -6.967 1.166 s -6.675 0.395 -7.112 0.395 s -7.112 -0.395 -7.112 -0.395 l -6.967 -1.166 l -6.766 -1.911 l -6.51 -2.63 l -6.2 -3.323 l -5.83 -3.99 l -5.406 -4.631 l -4.927 -5.246 l -12.442 -14.947 l -6.423 -7.267 l -6.775 -6.879 l -7.292 -6.311 l -1.923 -1.467 l -1.738 -1.256 l -3.34 -2.24 l -7 -4.067 l -7.354 -3.517 l -7.617 -2.97 l -7.789 -2.43 l -3.931 -1.014 l -2.114 -0.489 l -2.406 -0.509 l -9.637 -1.591 l -9.637 -0.987 l -9.613 -0.525 L 157 0 z</string>
 </resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 39e5190697569f952ccf7bf5a064629f0071c1d8..9bf9e53eb259d318ad18995ea9ed29f8fb28f733 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,6 +16,5 @@
 */
 -->
 <resources>
-    <dimen name="rounded_corner_content_padding">18px</dimen>
-    <dimen name="system_icons_keyguard_padding_end">30px</dimen>
+    <dimen name="rounded_corner_content_padding">44px</dimen>
 </resources>