Merge "Update RadioButtonPreference widget layout" into sc-dev