Merge \"Avoid destroying TextureView surfaces for onStop\" into nyc-mr1-dev
am: eaa6d6b2c9

Change-Id: Ic8207def7703c1209dbb3b33301803b32cc44bb7