Merge "Workaround issue with pip overlay not hiding cleanly." into oc-dev

am: 99a885b5d6

Change-Id: I867ea37ccf803f8e43b2a2a1c2b5099f2711a4d8

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

@@ -223,9 +223,9 @@ public class PipMenuActivity extends Activity {
     protected void onUserLeaveHint() {
         super.onUserLeaveHint();
 
-        // If another task is starting on top of the menu, then finish it so that it can be
+        // If another task is starting on top of the menu, then hide and finish it so that it can be
         // recreated on the top next time it starts
-        finish();
+        hideMenu();
     }
 
     @Override