Merge "Move HwVsyncState into VsyncSchedule"