Merge "vt: fix race in vt_waitactive()"