am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev

* commit '69421363c6a81a788b963d2f4cb5fdeaa8bd4200':
  ImageWriter: Exception when Surface is abandoned