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

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: I7f0f0e0a5d01991f0bce38ded4a5f2430499a07e