Merge "No-op when a transition happening on other display finished" into main

            // by finishing the recents animation and moving it to top. That also avoids flickering

            // due to wait for previous activity to be paused if it supports PiP that ignores the

            // effect of resume-while-pausing.

            if (r == null || r == mAnimatingRecents) {

            if (r == null || r == mAnimatingRecents || r.getDisplayId() != mDisplayId) {

                return;

            }

            if (mAnimatingRecents != null && mRecentsWillBeTop) {