Merge "Enhance support for filtering routes in route chooser dialog."