Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev am: 00515f8eab
am: d6846db29e

Change-Id: I4f58726b96b9af926149cc5ea8805d0dfbebaae1