Merge "Fix some lint for Settings"