Merge "Also update the account preferences in displayPreference()." into oc-dev