Merge "Fix setSurfaceTexture to handle surface caching"

            mSurface.release();

        }

        mSurface = surfaceTexture;

        // If the view is visible, update the listener in the new surface to use

        // the existing listener in the view.

        if (((mViewFlags & VISIBILITY_MASK) == VISIBLE)) {

            mSurface.setOnFrameAvailableListener(mUpdateListener);

        }

        mUpdateSurface = true;

        invalidateParentIfNeeded();

    }