Merge "Fix VirtualDeviceImpl#dump ordering" into main