Merge "hwc: Check for correct screen state before enabling vsync"