diff --git a/patches/button_backlight.patch b/patches/button_backlight.patch
index a4f1f73..8472770 100644
--- a/patches/button_backlight.patch
+++ b/patches/button_backlight.patch
@@ -1,8 +1,11 @@
+diff --git a/core/res/assets/images/android-logo-mask.png b/core/res/assets/images/android-logo-mask.png
+index 5512c0ad8a83..a998f1d52313 100644
+Binary files a/core/res/assets/images/android-logo-mask.png and b/core/res/assets/images/android-logo-mask.png differ
 diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
-index 7c0f4197363..16758ba496e 100644
+index 4bc70cf5856e..09c5fd36ea7d 100644
 --- a/services/core/java/com/android/server/display/DisplayPowerController.java
 +++ b/services/core/java/com/android/server/display/DisplayPowerController.java
-@@ -63,7 +63,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
+@@ -82,7 +82,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
  import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
  import com.android.server.policy.WindowManagerPolicy;
  
@@ -12,11 +15,11 @@ index 7c0f4197363..16758ba496e 100644
 +import java.io.IOException;
  import java.io.PrintWriter;
 +import java.io.Writer;
- import java.util.List;
+ import java.util.Objects;
  
  /**
-@@ -561,6 +566,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-         mDisplayWhiteBalanceController = displayWhiteBalanceController;
+@@ -1292,6 +1297,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+         }
      }
  
 +    private void changeKeyboardBacklightState(String value) {
@@ -31,31 +34,30 @@ index 7c0f4197363..16758ba496e 100644
 +        }
 +    }
 +
-     private Sensor findDisplayLightSensor(String sensorType) {
-         if (!TextUtils.isEmpty(sensorType)) {
-             List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
-@@ -1154,6 +1171,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+     private void loadBrightnessRampRates() {
+         mBrightnessRampRateFastDecrease = mDisplayDeviceConfig.getBrightnessRampFastDecrease();
+         mBrightnessRampRateFastIncrease = mDisplayDeviceConfig.getBrightnessRampFastIncrease();
+@@ -2005,6 +2022,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                  && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
              setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
-             mWindowManagerPolicy.screenTurnedOn();
+             mWindowManagerPolicy.screenTurnedOn(mDisplayId);
 +            changeKeyboardBacklightState("255");
          }
  
          // Grab a wake lock if we have unfinished business.
-@@ -1310,6 +1328,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -2264,6 +2282,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
              setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
              unblockScreenOn();
-             mWindowManagerPolicy.screenTurnedOff();
+             mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
 +            changeKeyboardBacklightState("0");
          } else if (!isOff
                  && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
  
-@@ -1317,6 +1336,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-             // Complete the full state transition on -> turningOff -> off.
+@@ -2272,6 +2291,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
              unblockScreenOff();
-             mWindowManagerPolicy.screenTurnedOff();
-+            changeKeyboardBacklightState("0");
+             mWindowManagerPolicy.screenTurnedOff(mDisplayId, mIsInTransition);
              setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
++            changeKeyboardBacklightState("0");
          }
-         if (!isOff && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF) {
-
+         if (!isOff
+                 && (mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF