Reland of "Mustash: Ensure surfaces submitted to Mus by WM and embedders contain Surfaces with embe…

services/ui/ws/server_window_compositor_frame_sink_manager.cc

Index: services/ui/ws/server_window_compositor_frame_sink_manager.cc
diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.cc b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
index 7480c7f1fcf9ffc4c5cd64b2ff239379df5a45de..b55d0a898cf7fc82d4ff6ce6edfe24465cf5537c 100644
--- a/services/ui/ws/server_window_compositor_frame_sink_manager.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink_manager.cc
@@ -29,9 +29,7 @@ bool ServerWindowCompositorFrameSinkManager::ShouldDraw() {
     return true;
 
   waiting_for_initial_frames_ = !IsCompositorFrameSinkReadyAndNonEmpty(
-                                    mojom::CompositorFrameSinkType::DEFAULT) ||
-                                !IsCompositorFrameSinkReadyAndNonEmpty(
-                                    mojom::CompositorFrameSinkType::UNDERLAY);
+      mojom::CompositorFrameSinkType::DEFAULT);
   return !waiting_for_initial_frames_;
 }