Merge "Continued SurfaceView lifetime fixes."