Merge "Unify RootActivityContainer and RootWindowContainer (80/n)"