Merge "Switched Task to use WindowContainer"