Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev