Merge "Revert "ViewRoot: Ensure we release surface from setWindowStopped."" into pi-dev am: 2754777d30
am: 7d710b90ca

Change-Id: Iaaf71070e73603f58bc467a913655948de37e4fb