Merge "Merge RootActivityContainer and RootWindowContainer (85/n)"