Merge "Move sorting widgets to sorting package." into nyc-andromeda-dev