Merge "Added TaskWindowContainerController"