Merge "Destroy dimLayer surface in removeDimLayerUser() if it is not fullscreen."

    }

    void removeDimLayerUser(DimLayer.DimLayerUser dimLayerUser) {

        DimLayerState state = mState.get(dimLayerUser);

        if (state != null) {

            // Destroy the surface, unless it's the shared fullscreen dim.

            if (state.dimLayer != mSharedFullScreenDimLayer) {

                state.dimLayer.destroySurface();

            }

            mState.remove(dimLayerUser);

        }

    }

    void applyDimBehind(DimLayer.DimLayerUser dimLayerUser, WindowStateAnimator animator) {

        applyDim(dimLayerUser, animator, false /* aboveApp */);