Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev