Merge "Add null check to virtual device manager"