Merge "Leave SettingsProvider running if cloning of a setting fails" into lmp-dev