Merge "Some logging for settings reset"