Merge "Settings: Add option to disable logging"