Merge "Fix support for negatively Z-ordered SubWindows."