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