Merge "Use the proper style for the SpacePreference." into oc-dr1-dev