Merge "Add additional information to virtualdevice dumpsys" into main