Merge "Remove divider above ExpandPreference." into oc-dev