Merge "drm/msm/sde: handle vblank during modeset"