RF-13320: Update OrderingList/PickList with refactored Widgets