Merge "Tweak preference layout padding" into sc-dev