Merge "Fix harmful nesting spy on RootWindowContainer"