Merge "Settings: Use new API for scan throttle toggle"