Merge "Fix mistake in SurfaceView lifetime refactoring."