Merge "Switched RootWindowContainer to use WindowContainer."