Merge "Fix DreamOverlayServiceTest." into main