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

Change-Id: Ic662d242231c5e8c375805930e59d55da0a15b01