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

Change-Id: I016ee20efafd4b3261c8d47fc1ee080a592dbefa