Do proper preference upgrade path

The preference upgrade path should generally be list of changes to apply, only for the versions that need a particular update. Some well-formed variation is possible, but this change specifically address an introduced bug that would flip one user preference and clear another, for users who were already up-to-date.