Merge "Synchronize RootWindowContainerTests" into pi-dev