Merge "Don't reparent task surface if it is not valid" into main

        @Override

        public void continueCollapse() {

            mBubble.cleanupTaskView();

            if (mTaskLeash == null) return;

            if (mTaskLeash == null || !mTaskLeash.isValid()) return;

            SurfaceControl.Transaction t = new SurfaceControl.Transaction();

            t.reparent(mTaskLeash, mRootLeash);

            t.apply();