Merge "Do not handle VSync event during resolution switch"

        // We received the present fence from the HWC, so we assume it successfully updated

        // the mode, hence we update SF.

        mSetActiveModePending = false;

        ON_MAIN_THREAD(setActiveModeInternal());

        {

            Mutex::Autolock lock(mStateLock);

            setActiveModeInternal();

        }

    }

    if (framePending) {