Merge "Do not handle VSync event during resolution switch"