Merge "Tweak spacing for horizontal preferences." into oc-dev