Merge "Fix lint errors for SettingsUIChanged atom event."