Merge "TIF: Reset main TvView only for explicit reset() call" into lmp-dev

                mSessionCallback.mTuneParams = params;

            }

        } else {

            reset();

            resetInternal();

            // When createSession() is called multiple times before the callback is called,

            // only the callback of the last createSession() call will be actually called back.

            // The previous callbacks will be ignored. For the logic, mSessionCallback

                sMainTvView = NULL_TV_VIEW;

            }

        }

        resetInternal();

    }

    private void resetInternal() {

        if (mSession != null) {

            release();

            resetSurfaceView();