Merge "Add workaround for PiP1 in sync-finished detection" into main

                    && !mDisplayContent.isSleeping()) {

                    && !mDisplayContent.isSleeping()) {

                // Visibility of starting activities isn't calculated until pause-complete, so if

                // Visibility of starting activities isn't calculated until pause-complete, so if

                // this is not paused yet, don't consider it ready.

                // this is not paused yet, don't consider it ready.

                // However, due to pip1 having an intermediate state, add a special exception here

                // that skips waiting if the next activity is already visible.

                final ActivityRecord toResume = isPip2ExperimentEnabled() ? null

                        : mDisplayContent.getActivity((r) -> !r.finishing

                        && r.isVisibleRequested()

                        && !r.isTaskOverlay()

                        && !r.isAlwaysOnTop());

                if (toResume == null || !toResume.isVisible()) {

                    return false;

                    return false;

                } else {

                    Slog.i(TAG, "Assuming sync-finish while pausing due to visible target");

                }

            }

            }

            return true;

            return true;

        }

        }