Merge "Rename `buttonSize` to `buttonPreferenceSize`." into main