Merge "Tweak spacing for horizontal preferences." into oc-dev am: b4937f4556
am: 88c721116b

Change-Id: I46f64ee45e2dc0941719e9d53abc0f4cba0fa79a