Merge "Manage redirectToWake state in DreamOverlayService." into main