Merge "Fix KVM launch issue"