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

Change-Id: I17a6635aa7952559a75dbbe80f4995550795d1d2