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

Change-Id: I4150775ce099d81c3df5ed821b5f522adf99d3c3