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

* commit '797c4344bd7b3f4980aa3cc09c3389a9473fe531':

Change-Id: I6a7b042c77059f06ada873424fccb66a0efd727f