Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev am: 9110429
am: 5cc4428

* commit '5cc4428bec11d4bcccb7165b0572014f434d6ccb':
  Don't reuse LOST_SURFACE for stopped

Change-Id: Ia5f1015dcc37b89e17623840de3bec9688360484