Merge "Added RootWindowContainer"