Update the ChangeLog (#10588 and better formatting)
Make sure we restore all preferences (closes #10588)
Update the ChangeLog