am 1ae0a7d3: am dd21689b: am cceb8268: am 69421363: Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev

* commit '1ae0a7d39bfe87d0857268070cbf0ff7fa666e37':
  ImageWriter: Exception when Surface is abandoned