Merge "Fix NPE when reparenting a leash that has already been released." into main

                    info.releaseAllSurfaces();

                    // Make sure that the transition leashes created are not leaked.

                    for (SurfaceControl leash : leashMap.values()) {

                        if (leash.isValid()) {

                            finishTransaction.reparent(leash, null);

                        }

                    }

                    // Don't release here since launcher might still be using them. Instead

                    // let launcher release them (eg. via RemoteAnimationTargets)

                    leashMap.clear();