Merge "Fix SurfaceView notifies on invalid surfaces."