diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a570bbb6670..453a71e1ad0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1582,7 +1582,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppListActivity"
             android:exported="true"
-            android:label="@string/aspect_ratio_title">
+            android:label="@string/aspect_ratio_experimental_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS"/>
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1595,7 +1595,7 @@
 
         <activity android:name="Settings$UserAspectRatioAppActivity"
                   android:exported="true"
-                  android:label="@string/aspect_ratio_title">
+                  android:label="@string/aspect_ratio_experimental_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_USER_ASPECT_RATIO_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/drawable/ic_battery_full.xml b/res/drawable/ic_battery_full.xml
index 8b1321f68ce..5dfac5553aa 100644
--- a/res/drawable/ic_battery_full.xml
+++ b/res/drawable/ic_battery_full.xml
@@ -18,7 +18,7 @@
         android:height="24dp"
         android:viewportWidth="960"
         android:viewportHeight="960"
-        android:tint="?attr/colorControlNormal">
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880Z"/>