Merge "Support multiple overlays in a task" into main