Merge "Sort routes in the chooser dialog, ignoring case differences" into nyc-support-25.1-dev