Merge "ViewRoot: Ensure we release surface from setWindowStopped." into pi-dev

core/java/android/view/ViewRootImpl.java

@@ -1339,6 +1339,10 @@ public final class ViewRootImpl implements ViewParent,
             for (int i = 0; i < mWindowStoppedCallbacks.size(); i++) {
                 mWindowStoppedCallbacks.get(i).windowStopped(stopped);
             }
+
+            if (mStopped) {
+                mSurface.release();
+            }
         }
     }