Merge "Fix DreamOverlayContainerViewControllerTests." into main