Merge "Revert "Fix DreamOverlayService memory leaks."" into main