Merge "KVM: vmx: fix missed cancellation of TSC deadline timer"