Merge "Choose a pref key less likely to conflict"