Merge "Fixed bug with pop-up window placement at the bottom in split-screen" into nyc-dev

services/core/java/com/android/server/wm/WindowState.java

@@ -697,7 +697,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
         // The offset from the layout containing frame to the actual containing frame.
         final int layoutXDiff;
         final int layoutYDiff;
-        if (mInsetFrame.isEmpty() && (fullscreenTask || layoutInParentFrame())) {
+        if (fullscreenTask || layoutInParentFrame()) {
             // We use the parent frame as the containing frame for fullscreen and child windows
             mContainingFrame.set(pf);
             mDisplayFrame.set(df);