Use betterpicker for HMS timeout.

// FREEBIE

Closes #1890