Merge "Increase scan time in settings"