Merge "Remove root window hierarchy logic from ActivityStackSupervior (40/n)"