[automerger skipped] Merge "Get new surface if it was released from...
[automerger skipped] Merge "Get new surface if it was released from setWindowStopped" am: 90424e80
am: b1b6baee -s ours
am skip reason: change_id I2324ed32980aae5a3ec2efbd612e6c143c9a0022 with SHA1 af2748b2 is in history
Change-Id: I83e2cea55e8253116b411afc8732438c088ed7c8