Merge "Fix a crash when changing preferences"