Merge "Fix test of wait-for-window-on-boot if wallpaper is disabled"

        for (int i = 0; i < types.length; i++) {

            final int type = types[i];

            windows[i] = createWindow(null /* parent */, type, displayContent, "window-" + type);

            windows[i].mHasSurface = false;

            windows[i].setHasSurface(true);

            windows[i].mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;

        }

        return windows;

    }