Merge "SurfaceView: Force surface disconnection before reuse." into nyc-mr1-dev am: 9d88f86190
am: ffff62d51b

Change-Id: I8357e881abae1e585ff6c81d0dce589ede2ed64a