Merge "Move overlay setup functionality to TaskView/Container" into main