Merge "Add config to enable / disable VirtualDeviceManager" into main