fix issue with running on multiple device types without setting a default timeout
Merge from master