When general settings is disabled, still display the current timeout in the UI
Fix typo
Merge remote-tracking branch 'origin/master'