am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."

* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
  Fix SurfaceView notifies on invalid surfaces.