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