Merge "SurfaceView: Force surface disconnection before reuse. am: 387838be95 am: 288ce4fc42" into nyc-mr1-dev-plus-aosp