Merge "Flag off parts of SBKVM/KVM#reset." into main