Merge "Fix DreamService race condition with overlay" into main