Merge "Fix potential crash when getting device info"