Resolve conflict in exo/wayland/server.cc in m53 branch

components/exo/wayland/server.cc

Index: components/exo/wayland/server.cc
diff --git a/components/exo/wayland/server.cc b/components/exo/wayland/server.cc
index dacbe82c922b80743878e01d33ed1cfd065fe259..d2de88ff6506147c31f1629dbbc09bfc26c515b0 100644
--- a/components/exo/wayland/server.cc
+++ b/components/exo/wayland/server.cc
@@ -1614,7 +1614,12 @@ class WaylandRemoteShell : public ash::ShellObserver,
   }
 
   // Overridden from ash::ShellObserver:
-  void OnDisplayWorkAreaInsetsChanged() override { SendConfigure(); }
+  void OnDisplayWorkAreaInsetsChanged() override {
+    const display::Display& primary =
+        ash::Shell::GetInstance()->display_manager()->GetDisplayForId(
+            display_id_);
+    SendConfigure_DEPRECATED(primary);
+  }
   void OnMaximizeModeStarted() override {
     layout_mode_ = ZWP_REMOTE_SHELL_V1_LAYOUT_MODE_TABLET;
     SendLayoutModeChange_DEPRECATED();