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

* commit '807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70':
  Fix SurfaceView notifies on invalid surfaces.