Merge "Remove WindowContainerController"