Merge "Add method to get deviceId from display in vdm"