Merge "Restore content surface to transition root when animation finishes" into main

    private final float[] mTmpFloats = new float[9];

    /** The leash of the changing window container. */

    private final SurfaceControl mSurfaceControl;

    private final SurfaceControl mRootLeash;

    private final int mAnimHint;

    private final int mStartWidth;

        mAnimHint = animHint;

        mSurfaceControl = change.getLeash();

        mRootLeash = rootLeash;

        mStartWidth = change.getStartAbsBounds().width();

        mStartHeight = change.getStartAbsBounds().height();

        mEndWidth = change.getEndAbsBounds().width();

            t.remove(mBackColorSurface);

        }

        if (mBackEffectSurface != null && mBackEffectSurface.isValid()) {

            // Restore the content surface to transition root because it was moved to BackEffect.

            if (mSurfaceControl.isValid() && mRootLeash.isValid()) {

                t.reparent(mSurfaceControl, mRootLeash);

            }

            t.remove(mBackEffectSurface);

        }

        t.apply();