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

* commit 'dd21689beef774e4a4732903061a03ed2a738fde':
  ImageWriter: Exception when Surface is abandoned