Issue #18833: Fixes to current attributes in Sort. Changing sort pickers to be PickerWidgets.