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