Merge "Plug some potential memory leaks in DreamOverlayContainerViewController" into main