Merge "Fix potential crash when getSensorList returns error"