Merge "Avoid destroying TextureView surfaces for onStop" into nyc-mr1-dev