Merge "Tweak vertical divider hight of RadioButtonPreference" into sc-dev