Merge "Remove TaskWindowContainerController & TaskWindowContainerListener (44/n)"