Merge "hwc: Simplify vsync code"