Merge "Merge "Clear cached override frame when window removed" into tm-qpr-dev...

        mWindowContainer = windowContainer;

        // TODO: remove the frame provider for non-WindowState container.

        mFrameProvider = frameProvider;

        mOverrideFrames.clear();

        mOverrideFrameProviders = overrideFrameProviders;

        if (windowContainer == null) {

            setServerVisible(false);

        updateSourceFrameForServerVisibility();

        if (mOverrideFrameProviders != null) {

            // Not necessary to clear the mOverrideFrames here. It will be cleared every time the

            // override frame provider updates.

            for (int i = mOverrideFrameProviders.size() - 1; i >= 0; i--) {

                final int windowType = mOverrideFrameProviders.keyAt(i);

                final Rect overrideFrame;