Merge "DefaultSettings: Remove some empty lines"