Merge "Get new surface if it was released from setWindowStopped"
am: 90424e8060

Change-Id: I0c90fa48d70bd3f3f5faeecd756fb7c28cbda85d