Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev