Merge "Revert "Add setting for volume dialog timeout"" into main