Merge "Amend the log for Settings.java" into main